From: <ibr...@us...> - 2012-05-03 14:37:17
|
Revision: 4295 http://tora.svn.sourceforge.net/tora/?rev=4295&view=rev Author: ibre5041 Date: 2012-05-03 14:37:00 +0000 (Thu, 03 May 2012) Log Message: ----------- trunk sync Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/cmake/modules/FindGraphViz.cmake branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt branches/tora3/src/CMakeLists.txt branches/tora3/src/connection/tooraclesetting.h branches/tora3/src/core/main.cpp branches/tora3/src/core/toabout.cpp branches/tora3/src/core/toabout.h branches/tora3/src/core/tobackground.h branches/tora3/src/core/tobackgroundlabel.h branches/tora3/src/core/tobarchart.cpp branches/tora3/src/core/tochangeconnection.h branches/tora3/src/core/tocodemodel.cpp branches/tora3/src/core/tocodemodel.h branches/tora3/src/core/toconf.h branches/tora3/src/core/toconfiguration.cpp branches/tora3/src/core/toconfiguration.h branches/tora3/src/core/todatatype.h branches/tora3/src/core/todockbar.h branches/tora3/src/core/todocklet.h branches/tora3/src/core/toeditablemenu.h branches/tora3/src/core/toeditwidget.h branches/tora3/src/core/toeventquery.h branches/tora3/src/core/toeventquerytask.h branches/tora3/src/core/toextract.cpp branches/tora3/src/core/toextract.h branches/tora3/src/core/toglobalsetting.h branches/tora3/src/core/tohelp.h branches/tora3/src/core/tohelpsetup.cpp branches/tora3/src/core/tohelpsetup.h branches/tora3/src/core/tohighlightedtext.h branches/tora3/src/core/tohtml.h branches/tora3/src/core/tolinechart.h branches/tora3/src/core/tolistviewformattercsv.h branches/tora3/src/core/tolistviewformatterhtml.h branches/tora3/src/core/tolistviewformattertabdel.h branches/tora3/src/core/tolistviewformattertext.h branches/tora3/src/core/tomain.cpp branches/tora3/src/core/tomain.h branches/tora3/src/core/tomainwindow.h branches/tora3/src/core/tomarkedtext.cpp branches/tora3/src/core/tomarkedtext.h branches/tora3/src/core/tomemoeditor.h branches/tora3/src/core/tomodeleditor.cpp branches/tora3/src/core/tomodeleditor.h branches/tora3/src/core/tonewconnection.h branches/tora3/src/core/toparamget.h branches/tora3/src/core/topiechart.h branches/tora3/src/core/topreferences.h branches/tora3/src/core/topushbutton.h branches/tora3/src/core/toqvalue.cpp branches/tora3/src/core/toqvalue.h branches/tora3/src/core/toresult.h branches/tora3/src/core/toresultcols.h branches/tora3/src/core/toresultcolscomment.h branches/tora3/src/core/toresultcombo.h branches/tora3/src/core/toresultdata.cpp branches/tora3/src/core/toresultdata.h branches/tora3/src/core/toresultdatasingle.cpp branches/tora3/src/core/toresultdatasingle.h branches/tora3/src/core/toresultextract.h branches/tora3/src/core/toresultfield.h branches/tora3/src/core/toresultlistformat.cpp branches/tora3/src/core/toresultlistformat.h branches/tora3/src/core/toresultplan.cpp branches/tora3/src/core/toresultplan.h branches/tora3/src/core/toresultresources.h branches/tora3/src/core/toresultschema.h branches/tora3/src/core/toresulttableview.cpp branches/tora3/src/core/toresulttableview.h branches/tora3/src/core/toresulttableviewedit.h branches/tora3/src/core/toresultview.h branches/tora3/src/core/tosearchreplace.h branches/tora3/src/core/tosql.h branches/tora3/src/core/tosqlparse.h branches/tora3/src/core/tosyntaxsetup.h branches/tora3/src/core/totableselect.h branches/tora3/src/core/totabwidget.h branches/tora3/src/core/totaskrunner.h branches/tora3/src/core/tothread.h branches/tora3/src/core/totool.h branches/tora3/src/core/totreewidget.cpp branches/tora3/src/core/totreewidget.h branches/tora3/src/core/tovisualize.h branches/tora3/src/core/utils.cpp branches/tora3/src/core/utils.h branches/tora3/src/docklets/tocodeoutline.h branches/tora3/src/docklets/tologging.h branches/tora3/src/docklets/toquerymodel.h branches/tora3/src/docklets/toviewconnections.h branches/tora3/src/docklets/toviewdirectory.h branches/tora3/src/migratetool/tora3.cpp branches/tora3/src/tocache.cpp branches/tora3/src/tochartmanager.cpp branches/tora3/src/toeditextensions.cpp branches/tora3/src/tools/toanalyze.h branches/tora3/src/tools/tobrowser.h branches/tora3/src/tools/tobrowserconstraint.h branches/tora3/src/tools/tobrowserindex.h branches/tora3/src/tools/tobrowsertable.h branches/tora3/src/tools/tofilesize.h branches/tora3/src/tools/tooutput.h branches/tora3/src/tools/toresultstorage.h branches/tora3/src/tools/tosession.h branches/tora3/src/tools/tosgastatement.h branches/tora3/src/tools/tosgatrace.h branches/tora3/src/tools/tostorage.h branches/tora3/src/tools/tostoragedefinition.cpp branches/tora3/src/tools/tostoragedefinition.h branches/tora3/src/tools/toworksheet.cpp branches/tora3/src/tools/toworksheet.h branches/tora3/src/tools/toworksheetstatistic.cpp branches/tora3/src/tools/toworksheetstatistic.h branches/tora3/src/tools/toworksheettext.cpp branches/tora3/src/tools/toworksheettext.h branches/tora3/src/tools/toworksheetwidget.cpp branches/tora3/src/tools/toworksheetwidget.h branches/tora3/src/tooracleextract.cpp branches/tora3/src/toplsqltext.cpp branches/tora3/src/toproject.cpp branches/tora3/src/toreport.cpp branches/tora3/src/toresultparam.cpp branches/tora3/src/toscript.cpp branches/tora3/src/tosqledit.cpp branches/tora3/src/toteradataconnection.cpp Added Paths: ----------- branches/tora3/src/core/toraversion.h Property Changed: ---------------- branches/tora3/src/windows/tora.ico Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/CMakeLists.txt 2012-05-03 14:37:00 UTC (rev 4295) @@ -18,7 +18,8 @@ #Set our CMake minimum version #Require 2.4.2 for Qt finding #Require 2.4.3 for moc change detection and rpath updates for custom cairo install -CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) +#Require 2.8 for svnversion +CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) # FIXME: dont't forget to change CMP0005 policy to NEW after 2.6.0 minimum required! # handle new cmake versions correctly @@ -27,7 +28,7 @@ cmake_policy(SET CMP0003 NEW) endif (POLICY CMP0003) if (POLICY CMP0005) - cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros + cmake_policy(SET CMP0005 NEW) # FIXME change it to new when there will be cmake 2.6.x in most distros endif (POLICY CMP0005) if (POLICY CMP0011) cmake_policy(SET CMP0011 NEW) @@ -51,10 +52,23 @@ INCLUDE(CheckCXXCompilerFlag) INCLUDE(CheckTypeSize) INCLUDE(TestBigEndian) +INCLUDE(FindSubversion) #Set the custom CMake module directory where our include/lib finders are SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") +# Check for SVN +FIND_PACKAGE(Subversion) +IF (Subversion_FOUND) + # a custom target that is always built + add_custom_target(revisiontag ALL) + # creates svnheader.h using cmake script + add_custom_command(TARGET revisiontag COMMAND ${CMAKE_COMMAND} + -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} + -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/getsvn.cmake) + ADD_DEFINITIONS("-DHAVE_SVNREVISION_H=1") +ENDIF(Subversion_FOUND) + #Project Setup PROJECT(TOra) #Set our version values @@ -66,16 +80,13 @@ SET (VERSION_SUFFIX "alpha") SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") +FILE(WRITE toversion.h "#define TOVERSION \"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}\"\n") SET (EXE_NAME "tora") if (WANT_BUNDLE) SET(EXE_NAME "TOra") endif(WANT_BUNDLE) -ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"") -# Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. -ADD_DEFINITIONS("-DCMAKE_BUILD") - # Ok, it has to be called after project is set. The we are sure we have size of void pointer set correctly... INCLUDE(LibSuffix) @@ -84,9 +95,9 @@ if (NOT TORA_DOC_DIR) IF (UNIX) - SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") + SET (TORA_DOC_DIR "share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") ELSE (UNIX) - SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/doc/") + SET (TORA_DOC_DIR "doc/") ENDIF (UNIX) endif (NOT TORA_DOC_DIR) @@ -318,8 +329,8 @@ #Create configure files.. config.h and uninstall #config.h # INCLUDE (ConfigureChecks.cmake) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -ADD_DEFINITIONS("-DHAVE_CONFIG_H") +##CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +##ADD_DEFINITIONS("-DHAVE_CONFIG_H") @@ -388,7 +399,6 @@ IF (WANT_RPM) # Check for SVN - FIND_PACKAGE(Subversion) IF(NOT Subversion_FOUND) SET(Subversion_SVN_EXECUTABLE true) ENDIF(NOT Subversion_FOUND) Modified: branches/tora3/cmake/modules/FindGraphViz.cmake =================================================================== --- branches/tora3/cmake/modules/FindGraphViz.cmake 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/cmake/modules/FindGraphViz.cmake 2012-05-03 14:37:00 UTC (rev 4295) @@ -162,4 +162,4 @@ # handle the QUIETLY and REQUIRED arguments and set GRAPHVIZ_FOUND to TRUE if # all listed variables are TRUE -find_package_handle_standard_args(GraphViz DEFAULT_MSG graphviz_LIBRARIES graphviz_INCLUDE_DIRECTORIES) \ No newline at end of file +find_package_handle_standard_args(GraphViz DEFAULT_MSG graphviz_LIBRARIES graphviz_INCLUDE_DIRECTORIES) Modified: branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt 2012-05-03 14:37:00 UTC (rev 4295) @@ -2,7 +2,7 @@ project(libantlr3c) OPTION(ANTLR3_NODEBUGGER "ANTLR debugger not required" OFF) -SET (VERSION "3.2") +SET (VERSION "3.3") SET (PACKAGE_BUGREPORT "ji...@te...") SET (PACKAGE ${CMAKE_PROJECT_NAME}) Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/CMakeLists.txt 2012-05-03 14:37:00 UTC (rev 4295) @@ -640,29 +640,12 @@ # dynamic SET(TORA_LIBS ${QT_LIBRARIES} - # ${ORACLE_LIBRARIES} ${LIBXML2_LIBRARIES} ${QSCINTILLA_LIBRARIES} ${TORA_LOKI_LIB} #static "antlr3c" #static ) -#IF (ORACLE_LIBRARIES) -# TARGET_LINK_LIBRARIES (${EXE_NAME} ${ORACLE_LIBRARIES} ) -#ENDIF (ORACLE_LIBRARIES) - -IF (POSTGRESQL_LIBRARIES) - LIST(APPEND TORA_LIBS ${POSTGRESQL_LIBRARIES}) -ENDIF (POSTGRESQL_LIBRARIES) - -IF (DB2_LIBRARIES) - LIST(APPEND TORA_LIBS} ${DB2_LIBRARIES}) -ENDIF (DB2_LIBRARIES) - -IF (TERADATA_LIBRARIES) -# LIST(APPEND TORA_LIBS ${TERADATA_LIBRARIES}) -ENDIF (TERADATA_LIBRARIES) - IF (POPPLER_QT4_FOUND) LIST(APPEND TORA_LIBS ${POPPLER_QT4_LIBRARIES}) ENDIF(POPPLER_QT4_FOUND) @@ -697,6 +680,8 @@ ) TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LIBS} ${TORA_MOC_LIB}) SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES ENABLE_EXPORTS ON) +# explicitly say that the executable depends on the svnheader +ADD_DEPENDENCIES(${EXE_NAME} revisiontag) IF(USE_PCH) # ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled_msvc.h) Modified: branches/tora3/src/connection/tooraclesetting.h =================================================================== --- branches/tora3/src/connection/tooraclesetting.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/connection/tooraclesetting.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -43,8 +43,8 @@ #define TOORACLESETTING_H #include "core/tora_export.h" -#include "config.h" + //tool #include "totool.h" #include "ui_tooraclesettingui.h" Modified: branches/tora3/src/core/main.cpp =================================================================== --- branches/tora3/src/core/main.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/main.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -52,6 +52,8 @@ #include "core/tosplash.h" #include "core/toconnection.h" #include "core/toeventquerytask.h" +#include "core/toraversion.h" + //#include "tohighlightedtext.h" //#include "toeventquery.h" @@ -209,14 +211,14 @@ TLOG(1,toDecorator,__HERE__) << " Ignored exception." << std::endl; } - if (toConfigurationSingle::Instance().lastVersion() != TOVERSION) + if (toConfigurationSingle::Instance().lastVersion() != TORAVERSION) { std::auto_ptr<toAbout> about ( new toAbout(toAbout::About, NULL, "About " TOAPPNAME, true)); if (!about->exec()) { exit (2); } - toConfigurationSingle::Instance().setLastVersion(TOVERSION); + toConfigurationSingle::Instance().setLastVersion(TORAVERSION); } Modified: branches/tora3/src/core/toabout.cpp =================================================================== --- branches/tora3/src/core/toabout.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toabout.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -40,10 +40,11 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/toabout.h" -#include "config.h" + #include "core/toconf.h" #include "core/LICENSE.h" #include "core/COPYRIGHT.h" +#include "core/toraversion.h" #include "icons/largelogo.xpm" @@ -161,8 +162,8 @@ } else { - setWindowTitle(tr(ABOUT_CAPTION).arg(QString::fromLatin1(TOVERSION))); - QString buffer = AboutText.arg(QString::fromLatin1(TOVERSION),QString::fromLatin1(CopyrightText)); + setWindowTitle(tr(ABOUT_CAPTION).arg(QString::fromLatin1(TORAVERSION))); + QString buffer = AboutText.arg(QString::fromLatin1(TORAVERSION),QString::fromLatin1(CopyrightText)); TextView->setHtml(buffer); CancelButton->hide(); } Modified: branches/tora3/src/core/toabout.h =================================================================== --- branches/tora3/src/core/toabout.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toabout.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOABOUT_H #define TOABOUT_H -#include "config.h" + #include "ui_toaboutui.h" class toAbout : public QDialog, public Ui::toAboutUI Modified: branches/tora3/src/core/tobackground.h =================================================================== --- branches/tora3/src/core/tobackground.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tobackground.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -7,7 +7,7 @@ #ifndef TOBACKGROUND_H #define TOBACKGROUND_H -#include "config.h" + #include "core/totimer.h" class toMainWindow; Modified: branches/tora3/src/core/tobackgroundlabel.h =================================================================== --- branches/tora3/src/core/tobackgroundlabel.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tobackgroundlabel.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -6,8 +6,8 @@ #ifndef TOBACKGROUNDLABEL_H #define TOBACKGROUNDLABEL_H -#include "config.h" + #include <QMovie> #include <QLabel> #include <QMouseEvent> Modified: branches/tora3/src/core/tobarchart.cpp =================================================================== --- branches/tora3/src/core/tobarchart.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tobarchart.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -39,8 +39,8 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include "config.h" + #include "core/tobarchart.h" #include "core/tomain.h" #include "core/utils.h" Modified: branches/tora3/src/core/tochangeconnection.h =================================================================== --- branches/tora3/src/core/tochangeconnection.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tochangeconnection.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOCHANGECONNECTION_H #define TOCHANGECONNECTION_H -#include "config.h" + #include "core/topushbutton.h" class QAction; Modified: branches/tora3/src/core/tocodemodel.cpp =================================================================== --- branches/tora3/src/core/tocodemodel.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tocodemodel.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -40,7 +40,7 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/tocodemodel.h" -#include "config.h" + #include "core/tosql.h" #include "core/toconnection.h" #include "core/tomain.h" Modified: branches/tora3/src/core/tocodemodel.h =================================================================== --- branches/tora3/src/core/tocodemodel.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tocodemodel.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOCODEMODEL_H #define TOCODEMODEL_H -#include "config.h" + #include "core/toconnection.h" #include <QAbstractItemModel> Modified: branches/tora3/src/core/toconf.h =================================================================== --- branches/tora3/src/core/toconf.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toconf.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -81,7 +81,7 @@ #define CONF_OBJECT_NAMES_UPPER "ObjectNamesUpper" #define DEFAULT_OBJECT_NAMES_UPPER false #define CONF_COLOR "KeywordColor" -////#define CONF_PLUGIN_DIR "PluginDir" +#define CONF_PLUGIN_DIR "PluginDir" #define CONF_CACHE_DIR "CacheDir" #define CONF_CACHE_DISK "CacheDiskUse" #define DEFAULT_CACHE_DISK true @@ -173,6 +173,10 @@ #define DEFAULT_ENCODING "Default" #define CONF_FORCELINEEND "ForceLineEnd" #define DEFAULT_FORCELINEEND "Default" + +#define DEFAULT_PLUGIN_DIR "share/tora/" +#define DEFAULT_HELP_DIR DEFAULT_PLUGIN_DIR "help/" + // code editor #define CONF_STATIC_CHECKER "StaticChecker" // connection (general) Modified: branches/tora3/src/core/toconfiguration.cpp =================================================================== --- branches/tora3/src/core/toconfiguration.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toconfiguration.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -75,7 +75,8 @@ bool m_highlight; bool m_keywordUpper; bool m_objectNamesUpper; - QString m_pluginDir; + mutable QDir m_pluginDir; + mutable QDir m_applicationDir; QString m_cacheDir; bool m_cacheDisk; QString m_sqlFile; @@ -262,6 +263,9 @@ toConfigurationPrivate() { + // Note we must save copy of this before we change into some other directory + // Note: m_applicationDir will be empty if QCoreApplication was not instantiated yet + m_applicationDir.setPath(""); loadConfig(); } @@ -270,24 +274,9 @@ */ QString getSpecialDir() { -//#if defined(Q_OS_WIN32) -// QString qstr; -// char dir[256]; -// if ( SHGetSpecialFolderPath(NULL, dir, CSIDL_APPDATA, false) ) -// { -// qstr = dir; -// if( !qstr.endsWith("\\") ) -// qstr += "\\"; -// qstr.replace( '\\', '/' ); -// } -// return qstr; -//#else return QDir::homePath() + "/"; -//#endif } - - void loadConfig() { int cnt; // tmp count holder for setting arrays @@ -316,8 +305,12 @@ m_highlight = s.value(CONF_HIGHLIGHT, true).toBool(); m_keywordUpper = s.value(CONF_KEYWORD_UPPER, DEFAULT_KEYWORD_UPPER).toBool(); m_objectNamesUpper = s.value(CONF_OBJECT_NAMES_UPPER, DEFAULT_OBJECT_NAMES_UPPER).toBool(); + + // Commented out. m_pluginDir depends QCoreApplication instance, and this one is not intantiated yet + // m_pluginDir = s.value(CONF_PLUGIN_DIR, DEFAULT_PLUGIN_DIR).toString(); + // overwrite CWD in m_pluginDir by empty string + m_pluginDir.setPath(""); -/// m_pluginDir = s.value(CONF_PLUGIN_DIR, DEFAULT_PLUGIN_DIR).toString(); m_cacheDir = s.value(CONF_CACHE_DIR, "").toString(); m_cacheDisk = s.value(CONF_CACHE_DISK, DEFAULT_CACHE_DISK).toBool(); m_sqlFile = s.value(CONF_SQL_FILE, getSpecialDir() + DEFAULT_SQL_FILE).toString(); @@ -573,7 +566,7 @@ s.setValue(CONF_HIGHLIGHT, m_highlight); s.setValue(CONF_KEYWORD_UPPER, m_keywordUpper); s.setValue(CONF_OBJECT_NAMES_UPPER, m_objectNamesUpper); -/// s.setValue(CONF_PLUGIN_DIR, m_pluginDir); + s.setValue(CONF_PLUGIN_DIR, m_pluginDir.absolutePath()); s.setValue(CONF_CACHE_DIR, m_cacheDir); s.setValue(CONF_CACHE_DISK, m_cacheDisk); s.setValue(CONF_SQL_FILE, m_sqlFile); @@ -1218,11 +1211,26 @@ QString toConfiguration::pluginDir() { - return p->m_pluginDir; + // Note we must save copy of this before we change into some other directory + if (p->m_applicationDir.absolutePath().isEmpty()) + p->m_applicationDir = QCoreApplication::applicationDirPath(); + + if (p->m_pluginDir.absolutePath().isEmpty()) + // m_pluginDir init + { + QSettings s; + s.beginGroup("preferences"); + QString configPath = s.value(CONF_PLUGIN_DIR, p->m_applicationDir.absolutePath() + QDir::separator () + DEFAULT_PLUGIN_DIR).toString(); + QDir shareDir(configPath); + + if (shareDir.exists()) + p->m_pluginDir = shareDir; + } + return p->m_pluginDir.absolutePath(); } void toConfiguration::setPluginDir(const QString & v) { - p->m_pluginDir = v; + p->m_pluginDir = v; } QString toConfiguration::cacheDir() Modified: branches/tora3/src/core/toconfiguration.h =================================================================== --- branches/tora3/src/core/toconfiguration.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toconfiguration.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -3,8 +3,8 @@ #include "core/tora_export.h" #include "core/tothread.h" -#include "config.h" + #include <loki/Singleton.h> #include <QStringList> #include <QMap> Modified: branches/tora3/src/core/todatatype.h =================================================================== --- branches/tora3/src/core/todatatype.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/todatatype.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TO_DATATYPE #define TO_DATATYPE -#include "config.h" + #include "core/toextract.h" #include <list> Modified: branches/tora3/src/core/todockbar.h =================================================================== --- branches/tora3/src/core/todockbar.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/todockbar.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TODOCKBAR_H #define TODOCKBAR_H -#include "config.h" + #include "core/topushbutton.h" #include <QAction> Modified: branches/tora3/src/core/todocklet.h =================================================================== --- branches/tora3/src/core/todocklet.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/todocklet.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TODOCKLET_H #define TODOCKLET_H -#include "config.h" + #include <QMap> #include <QAction> #include <QWidget> Modified: branches/tora3/src/core/toeditablemenu.h =================================================================== --- branches/tora3/src/core/toeditablemenu.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toeditablemenu.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOEDITABLEMENU_H #define TOEDITABLEMENU_H -#include "config.h" + #include <QMenu> #include <QKeyEvent> Modified: branches/tora3/src/core/toeditwidget.h =================================================================== --- branches/tora3/src/core/toeditwidget.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toeditwidget.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOEDITWIDGET_H #define TOEDITWIDGET_H -#include "config.h" + #include <QWidget> #include <list> Modified: branches/tora3/src/core/toeventquery.h =================================================================== --- branches/tora3/src/core/toeventquery.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toeventquery.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOEVENTQUERY_H #define TOEVENTQUERY_H -#include "config.h" + #include "core/toquery.h" #include "core/toconnection.h" #include "core/toconnectionsub.h" Modified: branches/tora3/src/core/toeventquerytask.h =================================================================== --- branches/tora3/src/core/toeventquerytask.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toeventquerytask.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOEVENTQUERYTASK_H #define TOEVENTQUERYTASK_H -#include "config.h" + #include "core/toconnection.h" #include "core/tothread.h" #include "core/toquery.h" Modified: branches/tora3/src/core/toextract.cpp =================================================================== --- branches/tora3/src/core/toextract.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toextract.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -44,13 +44,13 @@ #include "core/toconf.h" #include "core/toconnection.h" #include "core/toconnectiontraits.h" +#include "core/toraversion.h" #include <QApplication> #include <QProgressDialog> #include <QString> +#include <QHostInfo> -#include <stdio.h> - std::map<QString, toExtract::extractor *> *toExtract::Extractors; void toExtract::extractor::registerExtract(const QString &db, @@ -678,8 +678,6 @@ { if (!Heading) return QString::null; - char host[1024]; - gethostname(host, 1024); QString db = Connection.host(); if (db.length() && db != QString::fromLatin1("*")) @@ -696,8 +694,8 @@ "--\n" "-- on: %6\n" "--\n"). - arg(QString::fromLatin1(TOVERSION)). - arg(QString::fromLatin1(host)). + arg(QString::fromLatin1(TORAVERSION)). + arg(QHostInfo::localHostName()). arg(db). arg(QString(Connection.provider())). arg(QString(Connection.version())). Modified: branches/tora3/src/core/toextract.h =================================================================== --- branches/tora3/src/core/toextract.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toextract.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TO_EXTRACT #define TO_EXTRACT -#include "config.h" + #include <list> #include <map> Modified: branches/tora3/src/core/toglobalsetting.h =================================================================== --- branches/tora3/src/core/toglobalsetting.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toglobalsetting.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOGLOBALSETTING_H #define TOGLOBALSETTING_H -#include "config.h" + #include "core/tohelp.h" #include "core/totool.h" Modified: branches/tora3/src/core/tohelp.h =================================================================== --- branches/tora3/src/core/tohelp.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tohelp.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOHELP_H #define TOHELP_H -#include "config.h" + #include "core/totool.h" #include "ui_tohelpui.h" Modified: branches/tora3/src/core/tohelpsetup.cpp =================================================================== --- branches/tora3/src/core/tohelpsetup.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tohelpsetup.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -148,7 +148,7 @@ void toHelpPrefs::oracleManuals() { // For Oracle 11g look for a file /nav/portal_3.htm which contains a list of all books - QString filename = Utils::toOpenFilename(QString::null, QString::fromLatin1("*index.htm*"), this); + QString filename = Utils::toOpenFilename(QString::fromLatin1("*index.htm*"), this); try { toHtml file(Utils::toReadFile(filename)); Modified: branches/tora3/src/core/tohelpsetup.h =================================================================== --- branches/tora3/src/core/tohelpsetup.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tohelpsetup.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOHELPSETUP_H #define TOHELPSETUP_H -#include "config.h" + #include "core/totool.h" #include "ui_tohelpui.h" #include "ui_tohelpaddfileui.h" Modified: branches/tora3/src/core/tohighlightedtext.h =================================================================== --- branches/tora3/src/core/tohighlightedtext.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tohighlightedtext.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOHIGHLIGHTEDTEXT_H #define TOHIGHLIGHTEDTEXT_H -#include "config.h" + #include "core/tomarkedtext.h" #include <Qsci/qscilexer.h> Modified: branches/tora3/src/core/tohtml.h =================================================================== --- branches/tora3/src/core/tohtml.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tohtml.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOHTML_H #define TOHTML_H -#include "config.h" + #include <QString> #include <map> Modified: branches/tora3/src/core/tolinechart.h =================================================================== --- branches/tora3/src/core/tolinechart.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tolinechart.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOLINECHART_H #define TOLINECHART_H -#include "config.h" + #include <QWidget> #include <QString> #include <QPaintEvent> Modified: branches/tora3/src/core/tolistviewformattercsv.h =================================================================== --- branches/tora3/src/core/tolistviewformattercsv.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tolistviewformattercsv.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOLISTVIEWFORMATTERCSV_H #define TOLISTVIEWFORMATTERCSV_H -#include "config.h" + #include "core/tolistviewformatter.h" class toListViewFormatterCSV : public toListViewFormatter Modified: branches/tora3/src/core/tolistviewformatterhtml.h =================================================================== --- branches/tora3/src/core/tolistviewformatterhtml.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tolistviewformatterhtml.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOLISTVIEWFORMATTERHTML_H #define TOLISTVIEWFORMATTERHTML_H -#include "config.h" + #include "core/tolistviewformatter.h" class toListViewFormatterHTML : public toListViewFormatter Modified: branches/tora3/src/core/tolistviewformattertabdel.h =================================================================== --- branches/tora3/src/core/tolistviewformattertabdel.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tolistviewformattertabdel.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOLISTVIEWFORMATTERTABDEL_H #define TOLISTVIEWFORMATTERTABDEL_H -#include "config.h" + #include "core/tolistviewformatter.h" class toListViewFormatterTabDel : public toListViewFormatter Modified: branches/tora3/src/core/tolistviewformattertext.h =================================================================== --- branches/tora3/src/core/tolistviewformattertext.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tolistviewformattertext.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOLISTVIEWFORMATTERTEXT_H #define TOLISTVIEWFORMATTERTEXT_H -#include "config.h" + #include "core/tolistviewformatter.h" class toListViewFormatterText : public toListViewFormatter Modified: branches/tora3/src/core/tomain.cpp =================================================================== --- branches/tora3/src/core/tomain.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tomain.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -61,9 +61,11 @@ #include "core/toconnection.h" #include "core/tonewconnection.h" #include "core/tohighlightedtext.h" +#include "core/toraversion.h" #include "connection/absfact.h" #include "tools/toworksheet.h" + #include "icons/connect.xpm" #include "icons/copy.xpm" #include "icons/cut.xpm" @@ -137,7 +139,7 @@ updateRecent(); char buffer[100]; - sprintf(buffer, DEFAULT_TITLE, TOVERSION); + sprintf(buffer, DEFAULT_TITLE, TORAVERSION); setWindowTitle(tr(buffer)); setWindowIcon(QPixmap(const_cast<const char**>(tora_xpm))); @@ -1962,7 +1964,7 @@ void toMain::loadSession(void) { - QString filename = toOpenFilename(QString::null, QString::fromLatin1("*.tse"), this); + QString filename = toOpenFilename(QString::fromLatin1("*.tse"), this); if (!filename.isEmpty()) { try Modified: branches/tora3/src/core/tomain.h =================================================================== --- branches/tora3/src/core/tomain.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tomain.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -43,7 +43,7 @@ #define TOMAIN_H #include "core/tora_export.h" -#include "config.h" + #include "core/tobackground.h" #include "core/tomainwindow.h" Modified: branches/tora3/src/core/tomainwindow.h =================================================================== --- branches/tora3/src/core/tomainwindow.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tomainwindow.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -43,8 +43,8 @@ #define TOMAINWINDOW_H #include "core/tora_export.h" -#include "config.h" + #include <QMainWindow> class QMdiArea; Modified: branches/tora3/src/core/tomarkedtext.cpp =================================================================== --- branches/tora3/src/core/tomarkedtext.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tomarkedtext.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -351,7 +351,7 @@ if (!suggestedFile.isEmpty()) fname = suggestedFile; else - fname = Utils::toOpenFilename(QDir::currentPath(), QString::null, this); + fname = Utils::toOpenFilename(QString::null, this); if (!fname.isEmpty()) { Modified: branches/tora3/src/core/tomarkedtext.h =================================================================== --- branches/tora3/src/core/tomarkedtext.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tomarkedtext.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOMARKEDTEXT_H #define TOMARKEDTEXT_H -#include "config.h" + #include "core/toeditwidget.h" #include "core/tosearchreplace.h" Modified: branches/tora3/src/core/tomemoeditor.h =================================================================== --- branches/tora3/src/core/tomemoeditor.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tomemoeditor.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOMEMOEDITOR_H #define TOMEMOEDITOR_H -#include "config.h" + #include <QDialog> #include <QLabel> #include <QToolBar> Modified: branches/tora3/src/core/tomodeleditor.cpp =================================================================== --- branches/tora3/src/core/tomodeleditor.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tomodeleditor.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -1,4 +1,3 @@ - /* BEGIN_COMMON_COPYRIGHT_HEADER * * TOra - An Oracle Toolkit for DBA's and developers @@ -369,7 +368,7 @@ { Current = index; QVariant const &data = Model->data(Current, Qt::UserRole); - if(data.type() == QVariant::UserType && data.canConvert<toQValue::complexType*>() ) + if(data.type() == QVariant::UserType && data.canConvert<toQValue::complexType*>() ) { toQValue::complexType *i = data.value<toQValue::complexType*>(); setText(i->editData()); Modified: branches/tora3/src/core/tomodeleditor.h =================================================================== --- branches/tora3/src/core/tomodeleditor.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tomodeleditor.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOMEMOEDITOR_H #define TOMEMOEDITOR_H -#include "config.h" + #include <QDialog> #include <QLabel> #include <QToolBar> Modified: branches/tora3/src/core/tonewconnection.h =================================================================== --- branches/tora3/src/core/tonewconnection.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tonewconnection.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TONEWCONNECTION_H #define TONEWCONNECTION_H -#include "config.h" + #include "core/totool.h" #include "ui_tonewconnectionui.h" Modified: branches/tora3/src/core/toparamget.h =================================================================== --- branches/tora3/src/core/toparamget.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toparamget.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOPARAMGET_H #define TOPARAMGET_H -#include "config.h" + #include "core/toconnection.h" #include "core/toquery.h" #include "core/tohelp.h" Modified: branches/tora3/src/core/topiechart.h =================================================================== --- branches/tora3/src/core/topiechart.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/topiechart.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOPIECHART_H #define TOPIECHART_H -#include "config.h" + #include <list> #include <QWidget> #include <QMouseEvent> Modified: branches/tora3/src/core/topreferences.h =================================================================== --- branches/tora3/src/core/topreferences.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/topreferences.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOPREFERENCES_H #define TOPREFERENCES_H -#include "config.h" + #include "core/totool.h" #include <QVariant> Modified: branches/tora3/src/core/topushbutton.h =================================================================== --- branches/tora3/src/core/topushbutton.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/topushbutton.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOPUSHBUTTON_H #define TOPUSHBUTTON_H -#include "config.h" + #include <QPushButton> #include <QToolButton> Modified: branches/tora3/src/core/toqvalue.cpp =================================================================== --- branches/tora3/src/core/toqvalue.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toqvalue.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -82,7 +82,7 @@ /** Be destructive only if complexType is held * There should be no copying of data read from a query, * but toQValue is also used for query parameters(toQList and others) - * and these are copyined often (toNoBlockQuery.Params => toQuery.Params) + * and these are copied often (toNoBlockQuery.Params => toQuery.Params) */ if(isComplexType()) const_cast<toQValue&>(copy).Value = "deleted value(clone)"; @@ -96,7 +96,7 @@ /** Be destructive only if complexType is held * There should be no copying of data read from a query, * but toQValue is also used for query parameters(toQList and others) - * and these are copyined often (toNoBlockQuery.Params => toQuery.Params) + * and these are copied often (toNoBlockQuery.Params => toQuery.Params) */ if(isComplexType()) const_cast<toQValue&>(copy).Value = "deleted value(assign)"; @@ -252,7 +252,7 @@ QString toQValue::displayData() const { - if (isNull() && toConfigurationSingle::Instance().indicateEmpty()) + if( isNull() && toConfigurationSingle::Instance().indicateEmpty()) { return QString::fromLatin1("{null}"); } @@ -268,6 +268,12 @@ QString toQValue::editData() const { + if( isComplexType()) + { + complexType *i = Value.value<toQValue::complexType*>(); + return i->editData(); + } + return Value.toString(); } @@ -275,6 +281,13 @@ { if (isNull() ) return QString::fromLatin1("NULL"); + + if( isComplexType()) + { + complexType *i = Value.value<toQValue::complexType*>(); + return i->userData(); + } + return Value.toString(); } Modified: branches/tora3/src/core/toqvalue.h =================================================================== --- branches/tora3/src/core/toqvalue.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toqvalue.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOQVALUE_H #define TOQVALUE_H -#include "config.h" + #include "core/tora_export.h" #include <QString> Added: branches/tora3/src/core/toraversion.h =================================================================== --- branches/tora3/src/core/toraversion.h (rev 0) +++ branches/tora3/src/core/toraversion.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -0,0 +1,54 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2009 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#ifndef TOVERSION +#include "toversion.h" +#endif + +#if defined(HAVE_SVNREVISION_H) && !defined(SVNREVISION) +#include "svnrevision.h" +#endif + +#if defined(SVNREVISION) +#define TORAVERSION TOVERSION "." "(" SVNREVISION "svn)" +#else +#define TORAVERSION TOVERSION +#endif + Property changes on: branches/tora3/src/core/toraversion.h ___________________________________________________________________ Added: svn:executable + * Modified: branches/tora3/src/core/toresult.h =================================================================== --- branches/tora3/src/core/toresult.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresult.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULT_H #define TORESULT_H -#include "config.h" + #include "core/toqvalue.h" #include "core/toquery.h" #include "core/tosql.h" Modified: branches/tora3/src/core/toresultcols.h =================================================================== --- branches/tora3/src/core/toresultcols.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultcols.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTCOLS_H #define TORESULTCOLS_H -#include "config.h" + #include "core/toconnection.h" #include "core/toresulttableview.h" Modified: branches/tora3/src/core/toresultcolscomment.h =================================================================== --- branches/tora3/src/core/toresultcolscomment.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultcolscomment.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TORESULTCOLSCOMMENT_H #define TORESULTCOLSCOMMENT_H -#include "config.h" + #include <QString> #include <QLineEdit> #include <QFocusEvent> Modified: branches/tora3/src/core/toresultcombo.h =================================================================== --- branches/tora3/src/core/toresultcombo.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultcombo.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTCOMBO_H #define TORESULTCOMBO_H -#include "config.h" + #include "core/toresult.h" #include "core/tocache.h" Modified: branches/tora3/src/core/toresultdata.cpp =================================================================== --- branches/tora3/src/core/toresultdata.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultdata.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -40,7 +40,7 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/toresultdata.h" -#include "config.h" + #include "core/utils.h" #include "core/toconf.h" #include "core/toconfiguration.h" Modified: branches/tora3/src/core/toresultdata.h =================================================================== --- branches/tora3/src/core/toresultdata.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultdata.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTDATA_H #define TORESULTDATA_H -#include "config.h" + #include "core/toresulttableviewedit.h" #include "core/tosql.h" #include "core/toresult.h" Modified: branches/tora3/src/core/toresultdatasingle.cpp =================================================================== --- branches/tora3/src/core/toresultdatasingle.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultdatasingle.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -40,7 +40,7 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/toresultdatasingle.h" -#include "config.h" + #include "core/utils.h" #include "core/toconf.h" #include "core/toconfiguration.h" Modified: branches/tora3/src/core/toresultdatasingle.h =================================================================== --- branches/tora3/src/core/toresultdatasingle.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultdatasingle.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTDATASINGLE_H #define TORESULTDATASINGLE_H -#include "config.h" + #include "core/toresultmodel.h" #include <QWidget> Modified: branches/tora3/src/core/toresultextract.h =================================================================== --- branches/tora3/src/core/toresultextract.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultextract.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -43,7 +43,7 @@ #define TORESULTEXTRACT_H #include "tools/toworksheetwidget.h" -#include "config.h" + #include "core/toresult.h" class toSQL; Modified: branches/tora3/src/core/toresultfield.h =================================================================== --- branches/tora3/src/core/toresultfield.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultfield.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTFIELD_H #define TORESULTFIELD_H -#include "config.h" + #include "core/tohighlightedtext.h" #include "core/toresult.h" Modified: branches/tora3/src/core/toresultlistformat.cpp =================================================================== --- branches/tora3/src/core/toresultlistformat.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultlistformat.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #include <QSettings> #include "core/toresultlistformat.h" -#include "config.h" + #include "core/toconf.h" #include "core/utils.h" #include "core/tolistviewformatter.h" Modified: branches/tora3/src/core/toresultlistformat.h =================================================================== --- branches/tora3/src/core/toresultlistformat.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultlistformat.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTLISTFORMAT_H #define TORESULTLISTFORMAT_H -#include "config.h" + #include "ui_toresultlistformatui.h" #include <QDialog> Modified: branches/tora3/src/core/toresultplan.cpp =================================================================== --- branches/tora3/src/core/toresultplan.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultplan.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -67,18 +67,18 @@ } static toSQL SQLVSQLChildSel("toResultPlan:VSQLChildSel", - "SELECT distinct to_char(child_number)||' ('||to_char(plan_hash_value)||')' cn_disp, child_number, sql_id, plan_hash_value\n" - "FROM V$SQL_PLAN WHERE Address||':'||Hash_Value = '%1'\n" - "ORDER BY child_number", - "Get list of child plans for cursor", - "1000"); + "SELECT distinct to_char(child_number)||' ('||to_char(plan_hash_value)||')' cn_disp, child_number, sql_id, plan_hash_value\n" + "FROM V$SQL_PLAN WHERE Address||':'||Hash_Value = '%1'\n" + "ORDER BY child_number", + "Get list of child plans for cursor", + "1000"); static toSQL SQLVSQLChildSel9("toResultPlan:VSQLChildSel", - "SELECT distinct to_char(child_number) cn_disp, child_number, null sql_id, null plan_hash_value\n" - "FROM V$SQL_PLAN WHERE Address||':'||Hash_Value = '%1'\n" - "ORDER BY child_number", - "", - "0900"); + "SELECT distinct to_char(child_number) cn_disp, child_number, null sql_id, null plan_hash_value\n" + "FROM V$SQL_PLAN WHERE Address||':'||Hash_Value = '%1'\n" + "ORDER BY child_number", + "", + "0900"); static toSQL SQLViewVSQLPlan("toResultPlan:ViewVSQLPlan", "SELECT ID,NVL(Parent_ID,0),Operation, Options, Object_Name, Optimizer,cost,\n" @@ -192,7 +192,7 @@ QString sql = Utils::toShift(Statements); if (sql.isNull()) { - return ; + return ; } if (sql.length() > 0 && sql.at(sql.length() - 1).toLatin1() == ';') sql = sql.mid(0, sql.length() - 1); @@ -526,8 +526,8 @@ Last.clear(); toQueryParams par; Query = new toEventQuery(conn, //toQuery::Background, - toSQL::string(SQLViewVSQLPlan, conn).arg(Ident).arg(ChildNumber), - par); + toSQL::string(SQLViewVSQLPlan, conn).arg(Ident).arg(ChildNumber), + par); connectSlotsAndStart(); Reading = true; } Modified: branches/tora3/src/core/toresultplan.h =================================================================== --- branches/tora3/src/core/toresultplan.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultplan.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTPLAN_H #define TORESULTPLAN_H -#include "config.h" + #include "core/toresultview.h" #include "core/tosqlparse.h" #include "core/toconnection.h" Modified: branches/tora3/src/core/toresultresources.h =================================================================== --- branches/tora3/src/core/toresultresources.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultresources.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTRESOURCES_H #define TORESULTRESOURCES_H -#include "config.h" + #include "core/toresultitem.h" #include "core/tosql.h" Modified: branches/tora3/src/core/toresultschema.h =================================================================== --- branches/tora3/src/core/toresultschema.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultschema.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTSCHEMA_H #define TORESULTSCHEMA_H -#include "config.h" + #include "core/toresultcombo.h" class toConnection; Modified: branches/tora3/src/core/toresulttableview.cpp =================================================================== --- branches/tora3/src/core/toresulttableview.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresulttableview.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -40,7 +40,7 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/toresulttableview.h" -#include "config.h" + #include "core/toresultmodel.h" #include "core/toeventquery.h" #include "core/toconf.h" Modified: branches/tora3/src/core/toresulttableview.h =================================================================== --- branches/tora3/src/core/toresulttableview.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresulttableview.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTTABLEVIEW_H #define TORESULTTABLEVIEW_H -#include "config.h" + #include "core/toqvalue.h" #include "core/tosql.h" #include "core/toresult.h" Modified: branches/tora3/src/core/toresulttableviewedit.h =================================================================== --- branches/tora3/src/core/toresulttableviewedit.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresulttableviewedit.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTTABLEVIEWEDIT_H #define TORESULTTABLEVIEWEDIT_H -#include "config.h" + #include "core/toresulttableview.h" #include "core/toqvalue.h" #include "core/tosql.h" Modified: branches/tora3/src/core/toresultview.h =================================================================== --- branches/tora3/src/core/toresultview.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/toresultview.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TORESULTVIEW_H #define TORESULTVIEW_H -#include "config.h" + #include "core/toeditwidget.h" #include "core/toqvalue.h" #include "core/toresult.h" Modified: branches/tora3/src/core/tosearchreplace.h =================================================================== --- branches/tora3/src/core/tosearchreplace.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tosearchreplace.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOSEARCHREPLACE_H #define TOSEARCHREPLACE_H -#include "config.h" + #include "ui_tosearchreplaceui.h" #include "core/totool.h" #include "core/toeditwidget.h" Modified: branches/tora3/src/core/tosql.h =================================================================== --- branches/tora3/src/core/tosql.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tosql.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOSQL_H #define TOSQL_H -#include "config.h" + #include <map> #include <list> Modified: branches/tora3/src/core/tosqlparse.h =================================================================== --- branches/tora3/src/core/tosqlparse.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tosqlparse.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOSQLPARSE_H #define TOSQLPARSE_H -#include "config.h" + #include <QString> #include <list> Modified: branches/tora3/src/core/tosyntaxsetup.h =================================================================== --- branches/tora3/src/core/tosyntaxsetup.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tosyntaxsetup.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOSYNTAXSETUP_H #define TOSYNTAXSETUP_H -#include "config.h" + //#include "tohelp.h" #include "core/tohighlightedtext.h" #include "ui_tosyntaxsetupui.h" Modified: branches/tora3/src/core/totableselect.h =================================================================== --- branches/tora3/src/core/totableselect.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/totableselect.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -1,7 +1,7 @@ #ifndef TOTABLESELECT_H #define TOTABLESELECT_H -#include "config.h" + #include "totool.h" #include <QGroupBox> Modified: branches/tora3/src/core/totabwidget.h =================================================================== --- branches/tora3/src/core/totabwidget.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/totabwidget.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOTABWIDGET_H #define TOTABWIDGET_H -#include "config.h" + #include <QTabWidget> #include <QMap> #include <QPointer> Modified: branches/tora3/src/core/totaskrunner.h =================================================================== --- branches/tora3/src/core/totaskrunner.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/totaskrunner.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOTASKRUNNER_H #define TOTASKRUNNER_H -#include "config.h" + #include "tothread.h" #include <QThread> Modified: branches/tora3/src/core/tothread.h =================================================================== --- branches/tora3/src/core/tothread.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tothread.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -43,8 +43,8 @@ #define TOTHREAD_H #include "core/tora_export.h" -#include "config.h" + #include <QMutex> #include <QWaitCondition> #include <QThread> Modified: branches/tora3/src/core/totool.h =================================================================== --- branches/tora3/src/core/totool.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/totool.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,7 +42,7 @@ #ifndef TOTOOL_H #define TOTOOL_H -#include "config.h" + #include "core/toconfiguration.h" #include <map> Modified: branches/tora3/src/core/totreewidget.cpp =================================================================== --- branches/tora3/src/core/totreewidget.cpp 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/totreewidget.cpp 2012-05-03 14:37:00 UTC (rev 4295) @@ -40,8 +40,8 @@ * END_COMMON_COPYRIGHT_HEADER */ #include "core/totreewidget.h" -#include "config.h" + #include <QTreeWidget> #include <QTreeWidgetItem> Modified: branches/tora3/src/core/totreewidget.h =================================================================== --- branches/tora3/src/core/totreewidget.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/totreewidget.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOTREEWIDGET_H #define TOTREEWIDGET_H -#include "config.h" + #include <QTreeWidget> #include <QTreeWidgetItem> #include <QTreeWidgetItemIterator> @@ -770,8 +770,7 @@ * Delete all item children */ virtual void deleteChildren(); - - + /** * If b is true the item is enabled; otherwise it is * disabled. Disabled items are drawn differently Modified: branches/tora3/src/core/tovisualize.h =================================================================== --- branches/tora3/src/core/tovisualize.h 2012-05-03 14:28:43 UTC (rev 4294) +++ branches/tora3/src/core/tovisualize.h 2012-05-03 14:37:00 UTC (rev 4295) @@ -42,8 +42,8 @@ #ifndef TOVISUALIZE_H #define TOVISUALIZE_H -#include "config.h" + #include <QWidget> #include <algorithm> Modified: ... [truncated message content] |
From: <ibr...@us...> - 2012-05-03 20:54:45
|
Revision: 4300 http://tora.svn.sourceforge.net/tora/?rev=4300&view=rev Author: ibre5041 Date: 2012-05-03 18:55:15 +0000 (Thu, 03 May 2012) Log Message: ----------- typpo fix Modified Paths: -------------- branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h branches/tora3/src/connection/tooraclefind.cpp branches/tora3/src/connection/toteradatafind.cpp branches/tora3/src/core/toconnectionprovider.cpp branches/tora3/src/core/toconnectionprovider.h branches/tora3/src/core/tomain.cpp Added Paths: ----------- branches/tora3/src/stdafx.cpp Modified: branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h =================================================================== --- branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h 2012-05-03 15:26:23 UTC (rev 4299) +++ branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h 2012-05-03 18:55:15 UTC (rev 4300) @@ -16,19 +16,19 @@ #define PACKAGE_NAME "TOra" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "TOra 3.2" +#define PACKAGE_STRING "TOra 3.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "TOra" /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.2" +#define PACKAGE_VERSION "3.3" /* Define to 1 if you have the ANSI C header files. */ /* #undef STDC_HEADERS */ /* Version number of package */ -#define VERSION "3.2" +#define VERSION "3.3" /* Define to 1 if you have the <arpa/nameser.h> header file. */ /* #undef HAVE_ARPA_NAMESER_H */ Modified: branches/tora3/src/connection/tooraclefind.cpp =================================================================== --- branches/tora3/src/connection/tooraclefind.cpp 2012-05-03 15:26:23 UTC (rev 4299) +++ branches/tora3/src/connection/tooraclefind.cpp 2012-05-03 18:55:15 UTC (rev 4300) @@ -317,7 +317,7 @@ - setenv("LD_LIBRARY_PATH", ..); does not work. glibc preverses copy of this variable and ignores any further changes - dlopen("/opt/instantclient_11_1/libclntsh.so.11.1"); - fails. libclntsh.so.11.1 depend on libnnz.so + fails. libclntsh.so.11.1 depends on libnnz.so - dlopen("/opt/instantclient_11_1/libnns.so"); fails. libnnz.so depends on libclntsh.so.11.1. There is cyclic dependency between these libraries. - chdir("/opt/instantclient_11_1"); @@ -361,7 +361,7 @@ m_OCILoaded = true; } -Util::RegisterInFactory<toOracleInstantFinder, ConnectionProvirerFinderFactory> regToOracleInstantFind(ORACLE_INSTANTCLIENT); +Util::RegisterInFactory<toOracleInstantFinder, ConnectionProviderFinderFactory> regToOracleInstantFind(ORACLE_INSTANTCLIENT); class toOracleFinder : public toOracleInstantFinder @@ -440,4 +440,4 @@ m_OCILoaded = true; } -Util::RegisterInFactory<toOracleFinder, ConnectionProvirerFinderFactory> regToOracleFind(ORACLE_TNSCLIENT); +Util::RegisterInFactory<toOracleFinder, ConnectionProviderFinderFactory> regToOracleFind(ORACLE_TNSCLIENT); Modified: branches/tora3/src/connection/toteradatafind.cpp =================================================================== --- branches/tora3/src/connection/toteradatafind.cpp 2012-05-03 15:26:23 UTC (rev 4299) +++ branches/tora3/src/connection/toteradatafind.cpp 2012-05-03 18:55:15 UTC (rev 4300) @@ -225,4 +225,4 @@ m_CLIv2Loaded = true; } -Util::RegisterInFactory<toTeradataFinder, ConnectionProvirerFinderFactory> regToTeradataFind("Teradata"); +Util::RegisterInFactory<toTeradataFinder, ConnectionProviderFinderFactory> regToTeradataFind("Teradata"); Modified: branches/tora3/src/core/toconnectionprovider.cpp =================================================================== --- branches/tora3/src/core/toconnectionprovider.cpp 2012-05-03 15:26:23 UTC (rev 4299) +++ branches/tora3/src/core/toconnectionprovider.cpp 2012-05-03 18:55:15 UTC (rev 4300) @@ -53,7 +53,7 @@ } /* load all dlls. */ - std::auto_ptr<toConnectionProviderFinder> finder = ConnectionProvirerFinderFactory::Instance().create(finderName.toStdString(), 0); + std::auto_ptr<toConnectionProviderFinder> finder = ConnectionProviderFinderFactory::Instance().create(finderName.toStdString(), 0); finder->load(providerParams); /* dlls are loaded. Create instance of the toConnectioProvider */ Modified: branches/tora3/src/core/toconnectionprovider.h =================================================================== --- branches/tora3/src/core/toconnectionprovider.h 2012-05-03 15:26:23 UTC (rev 4299) +++ branches/tora3/src/core/toconnectionprovider.h 2012-05-03 18:55:15 UTC (rev 4300) @@ -115,7 +115,7 @@ /** Declare datatype for finder factory */ typedef Util::GenericFactory<toConnectionProviderFinder, LOKI_TYPELIST_1(unsigned int)> ConnectionProvirerFinderFact; /** This singleton represents the only instance of the factory */ -class ConnectionProvirerFinderFactory: public Loki::SingletonHolder<ConnectionProvirerFinderFact> {}; +class ConnectionProviderFinderFactory: public Loki::SingletonHolder<ConnectionProvirerFinderFact> {}; /** This class holds pointers into all the dynamically loaded connection providers. */ Modified: branches/tora3/src/core/tomain.cpp =================================================================== --- branches/tora3/src/core/tomain.cpp 2012-05-03 15:26:23 UTC (rev 4299) +++ branches/tora3/src/core/tomain.cpp 2012-05-03 18:55:15 UTC (rev 4300) @@ -203,14 +203,14 @@ BackgroundLabel->setToolTip(tr("No background queries.")); // List of all connection provider finders - std::vector<std::string> finders = ConnectionProvirerFinderFactory::Instance().keys(); + std::vector<std::string> finders = ConnectionProviderFinderFactory::Instance().keys(); // Resulting list of all the providers found QList<toConnectionProviderFinder::ConnectionProvirerParams> allProviders; // Loop over all finders and all ther find method each of them can return more locations for(std::vector<std::string>::const_iterator i = finders.begin(); i != finders.end(); ++i) { TLOG(5, toDecorator, __HERE__) << "Looking for client: " << *i << std::endl; - std::auto_ptr<toConnectionProviderFinder> finder = ConnectionProvirerFinderFactory::Instance().create(*i, 0); + std::auto_ptr<toConnectionProviderFinder> finder = ConnectionProviderFinderFactory::Instance().create(*i, 0); QList<toConnectionProviderFinder::ConnectionProvirerParams> l = finder->find(); allProviders.append(l); } Added: branches/tora3/src/stdafx.cpp =================================================================== --- branches/tora3/src/stdafx.cpp (rev 0) +++ branches/tora3/src/stdafx.cpp 2012-05-03 18:55:15 UTC (rev 4300) @@ -0,0 +1,9 @@ +// stdafx.cpp : source file that includes just the standard includes +// Server.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +//#include "stdafx.h" +#include "precompiled.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file Property changes on: branches/tora3/src/stdafx.cpp ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-05-08 18:03:16
|
Revision: 4307 http://tora.svn.sourceforge.net/tora/?rev=4307&view=rev Author: ibre5041 Date: 2012-05-08 18:03:05 +0000 (Tue, 08 May 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/extlibs/libantlr3c-3.3/include/antlr3.h branches/tora3/src/CMakeLists.txt Removed Paths: ------------- branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-05-08 17:24:26 UTC (rev 4306) +++ branches/tora3/CMakeLists.txt 2012-05-08 18:03:05 UTC (rev 4307) @@ -80,7 +80,7 @@ SET (VERSION_SUFFIX "alpha") SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}) MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}") -FILE(WRITE toversion.h "#define TOVERSION \"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}\"\n") +FILE(WRITE ${CMAKE_BINARY_DIR}/toversion.h "#define TOVERSION \"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}\"\n") SET (EXE_NAME "tora") if (WANT_BUNDLE) Deleted: branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h =================================================================== --- branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h 2012-05-08 17:24:26 UTC (rev 4306) +++ branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h 2012-05-08 18:03:05 UTC (rev 4307) @@ -1,180 +0,0 @@ -/* antlr3config.h.in.cmake Generated from antlr3config.h.in and adopted for cmake */ - -/* Define if ANTLR debugger not required */ -#define ANTLR3_NODEBUGGER - -/* Define if 64 bit mode required */ -/* #undef ANTLR3_USE_64BIT */ - -/* Name of package */ -#define PACKAGE "TOra" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "ji...@te..." - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "TOra" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "TOra 3.3" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "TOra" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "3.3" - -/* Define to 1 if you have the ANSI C header files. */ -/* #undef STDC_HEADERS */ - -/* Version number of package */ -#define VERSION "3.3" - -/* Define to 1 if you have the <arpa/nameser.h> header file. */ -/* #undef HAVE_ARPA_NAMESER_H */ - -/* Define to 1 if you have the <ctype.h> header file. */ -#define HAVE_CTYPE_H 1 - -/* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if the system has the type `intptr_t'. */ -/* #undef HAVE_INTPTR_T */ - -/* Define to 1 if you have the <inttypes.h> header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define to 1 if you have the <malloc.h> header file. */ -#define HAVE_MALLOC_H 1 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#define HAVE_MEMSET 1 - -/* Define to 1 if you have the <netdb.h> header file. */ -/* #undef HAVE_NETDB_H */ - -/* Define to 1 if you have the <netinet/in.h> header file. */ -/* #undef HAVE_NETINET_IN_H */ - -/* Define to 1 if you have the <netinet/tcp.h> header file. */ -/* #undef HAVE_NETINET_TCP_H */ - -/* Define to 1 if you have the <resolv.h> header file. */ -/* #undef HAVE_RESOLV_H */ - -/* Define to 1 if you have the <socket.h> header file. */ -/* #undef HAVE_SOCKET_H */ - -/* Define to 1 if you have the <stdarg.h> header file. */ -#define HAVE_STDARG_H 1 - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the <strings.h> header file. */ -/* #undef HAVE_STRINGS_H */ - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the <sys/malloc.h> header file. */ -/* #undef HAVE_SYS_MALLOC_H */ - -/* Define to 1 if you have the <sys/socket.h> header file. */ -/* #undef HAVE_SYS_SOCKET_H */ - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if the system has the type `uintptr_t'. */ -/* #undef HAVE_UINTPTR_T */ - -/* Define to 1 if you have the <unistd.h> header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to 1 if you have the `accept' function. */ -/* #undef HAVE_ACCEPT */ - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - - -/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the - #define below would cause a syntax error. */ -/* #undef _UINT32_T */ - -/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the - #define below would cause a syntax error. */ -/* #undef _UINT64_T */ - -/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>, - <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the - #define below would cause a syntax error. */ -/* #undef _UINT8_T */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to the type of a signed integer type of width exactly 16 bits if - such a type exists and the standard includes do not define it. */ -/* #undef int16_t */ - -/* Define to the type of a signed integer type of width exactly 32 bits if - such a type exists and the standard includes do not define it. */ -/* #undef int32_t */ - -/* Define to the type of a signed integer type of width exactly 64 bits if - such a type exists and the standard includes do not define it. */ -/* #undef int64_t */ - -/* Define to the type of a signed integer type of width exactly 8 bits if such - a type exists and the standard includes do not define it. */ -/* #undef int8_t */ - -/* Define to the type of a signed integer type wide enough to hold a pointer, - if such a type exists, and if the system does not define it. */ -/* #undef intptr_t */ - -/* Define to `unsigned int' if <sys/types.h> does not define. */ -/* #undef size_t */ - -/* Define to the type of an unsigned integer type of width exactly 16 bits if - such a type exists and the standard includes do not define it. */ -/* #undef uint16_t */ - -/* Define to the type of an unsigned integer type of width exactly 32 bits if - such a type exists and the standard includes do not define it. */ -/* #undef uint32_t */ - -/* Define to the type of an unsigned integer type of width exactly 64 bits if - such a type exists and the standard includes do not define it. */ -/* #undef uint64_t */ - -/* Define to the type of an unsigned integer type of width exactly 8 bits if - such a type exists and the standard includes do not define it. */ -/* #undef uint8_t */ - -/* Define to the type of an unsigned integer type wide enough to hold a - pointer, if such a type exists, and if the system does not define it. */ -/* #undef uintptr_t */ Modified: branches/tora3/extlibs/libantlr3c-3.3/include/antlr3.h =================================================================== --- branches/tora3/extlibs/libantlr3c-3.3/include/antlr3.h 2012-05-08 17:24:26 UTC (rev 4306) +++ branches/tora3/extlibs/libantlr3c-3.3/include/antlr3.h 2012-05-08 18:03:05 UTC (rev 4307) @@ -30,6 +30,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF // THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include <antlr3config.h> #include <antlr3defs.h> #include <antlr3errors.h> Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-05-08 17:24:26 UTC (rev 4306) +++ branches/tora3/src/CMakeLists.txt 2012-05-08 18:03:05 UTC (rev 4307) @@ -20,8 +20,8 @@ ${CMAKE_SOURCE_DIR}/extlibs/loki/include ${CMAKE_SOURCE_DIR}/extlibs/otl ${CMAKE_SOURCE_DIR}/extlibs/trotl/src - ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3 - ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3/include + ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3/include + ${CMAKE_BINARY_DIR}/extlibs/libantlr3c-3.3 # generated antlr3config.h ${BOOST_INCLUDE_DIRS} ${QT_INCLUDES} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-05-09 11:28:54
|
Revision: 4310 http://tora.svn.sourceforge.net/tora/?rev=4310&view=rev Author: ibre5041 Date: 2012-05-09 11:28:43 +0000 (Wed, 09 May 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/cmake/modules/PCHSupport_26.cmake branches/tora3/src/CMakeLists.txt Added Paths: ----------- branches/tora3/extlibs/parsing/ Modified: branches/tora3/cmake/modules/PCHSupport_26.cmake =================================================================== --- branches/tora3/cmake/modules/PCHSupport_26.cmake 2012-05-08 18:33:17 UTC (rev 4309) +++ branches/tora3/cmake/modules/PCHSupport_26.cmake 2012-05-09 11:28:43 UTC (rev 4310) @@ -70,7 +70,7 @@ ENDFOREACH(item) # MESSAGE("_directory_flags ${_directory_flags}" ) GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS) - #MESSAGE("_directory_flags ${_directory_flags}" ) + MESSAGE("_directory_flags ${_directory_flags}" ) GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS) LIST(APPEND ${_out_compile_flags} ${_directory_flags}) LIST(APPEND ${_out_compile_flags} ${_global_definitions}) @@ -237,8 +237,8 @@ _PCH_GET_COMPILE_FLAGS(_compile_FLAGS) - #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}") - #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}") + MESSAGE("_compile_FLAGS: ${_compile_FLAGS}") + MESSAGE("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}") SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${_name} PROPERTIES GENERATED 1) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name} @@ -246,7 +246,7 @@ DEPENDS ${_input} ) - #message("_command ${_input} ${_output}") + MESSAGE("_command ${_input} ${_output}") _PCH_GET_COMPILE_COMMAND(_command ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output} ) #message(${_input} ) Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-05-08 18:33:17 UTC (rev 4309) +++ branches/tora3/src/CMakeLists.txt 2012-05-09 11:28:43 UTC (rev 4310) @@ -3,7 +3,6 @@ #Subdirectories # ADD_SUBDIRECTORY(i18n) -##ADD_SUBDIRECTORY(parsing) IF (WIN32) ADD_SUBDIRECTORY(windows) SET(TORA_LIB "tora") @@ -326,6 +325,7 @@ # # shortcuteditor ) + IF (ORACLE_FOUND) LIST(APPEND TORA_MOC_CLASSES connection/tooraclesetting.h) ENDIF (ORACLE_FOUND) @@ -544,18 +544,22 @@ # tooracletable.cpp ) -LIST(APPEND TORA_SOURCES - "parsing/tsqlparse.cpp" - "parsing/tsqlparseoracle.cpp" - "parsing/tplsqlparseoracle.cpp" - "parsing/tsqllexeroracle.cpp" - "parsing/error_handler.c" - "parsing/OracleSQLLexer.c" - "parsing/OracleSQLParser.c" - "parsing/OraclePLSQLLexer.c" - "parsing/OraclePLSQLParser.c" - ) +# LIST(APPEND TORA_SOURCES +# "parsing/tsqlparse.cpp" +# "parsing/tsqlparseoracle.cpp" +# "parsing/tplsqlparseoracle.cpp" +# "parsing/tsqllexeroracle.cpp" +# "parsing/error_handler.c" +# "parsing/OracleSQLLexer.c" +# "parsing/OracleSQLParser.c" +# "parsing/OraclePLSQLLexer.c" +# "parsing/OraclePLSQLParser.c" +# ) +IF (USE_PCH) + LIST(APPEND TORA_SOURCES "stdafx.cpp") +ENDIF (USE_PCH) + IF(ORACLE_FOUND) LIST(APPEND TORA_SOURCES connection/tooraclesetting.cpp) ENDIF(ORACLE_FOUND) @@ -705,7 +709,11 @@ ADD_DEPENDENCIES("test1" revisiontag) IF(USE_PCH) - # ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) + IF(CMAKE_GENERATOR MATCHES Visual*) + ADD_NATIVE_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) + ELSE(CMAKE_GENERATOR MATCHES Visual*) + ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) + ENDIF(CMAKE_GENERATOR MATCHES Visual*) ENDIF(USE_PCH) # Connection provider libraries This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-05-09 13:52:12
|
Revision: 4311 http://tora.svn.sourceforge.net/tora/?rev=4311&view=rev Author: ibre5041 Date: 2012-05-09 13:52:01 +0000 (Wed, 09 May 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/cmake/modules/PCHSupport_26.cmake branches/tora3/extlibs/CMakeLists.txt branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt branches/tora3/extlibs/parsing/tsqlparseoracle.cpp branches/tora3/extlibs/parsing/tsqlparser_export.h branches/tora3/extlibs/trotl/src/CMakeLists.txt branches/tora3/src/CMakeLists.txt Added Paths: ----------- branches/tora3/extlibs/parsing/CMakeLists.txt Modified: branches/tora3/cmake/modules/PCHSupport_26.cmake =================================================================== --- branches/tora3/cmake/modules/PCHSupport_26.cmake 2012-05-09 11:28:43 UTC (rev 4310) +++ branches/tora3/cmake/modules/PCHSupport_26.cmake 2012-05-09 13:52:01 UTC (rev 4311) @@ -338,3 +338,21 @@ ENDIF(CMAKE_GENERATOR MATCHES Visual*) ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER) + +FUNCTION (ADD_MSVC_PRECOMPILED_HEADERS PrecompiledSource PrecompiledHeader TargetProject) + IF (MSVC) + # define the location of the precompiled header + SET(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${TargetProject}.pch") + # set the target project to use the precompiled binary + SET_PROPERTY(TARGET ${TargetProject} + APPEND + PROPERTY COMPILE_FLAGS + "/Yu\"${PrecompiledHeader}\" /Fp\"${PrecompiledBinary}\" /FI\"${PrecompiledHeader}\"") + # set the source file to compile out the pch + SET_PROPERTY(SOURCE ${PrecompiledSource} + APPEND + PROPERTY COMPILE_FLAGS + "/Yc\"${PrecompiledHeader}\" /Fp\"${PrecompiledBinary}\" /FI\"${PrecompiledHeader}\"") + ENDIF (MSVC) +ENDFUNCTION (ADD_MSVC_PRECOMPILED_HEADERS) + Modified: branches/tora3/extlibs/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/CMakeLists.txt 2012-05-09 11:28:43 UTC (rev 4310) +++ branches/tora3/extlibs/CMakeLists.txt 2012-05-09 13:52:01 UTC (rev 4311) @@ -21,7 +21,8 @@ ADD_SUBDIRECTORY(qscintilla2) ENDIF(WANT_INTERNAL_QSCINTILLA) - ADD_SUBDIRECTORY(libantlr3c-3.3) +ADD_SUBDIRECTORY(libantlr3c-3.3) +ADD_SUBDIRECTORY(parsing) IF (USE_EXPERIMENTAL) ADD_SUBDIRECTORY(libermodel) ENDIF(USE_EXPERIMENTAL) Modified: branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt 2012-05-09 11:28:43 UTC (rev 4310) +++ branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt 2012-05-09 13:52:01 UTC (rev 4311) @@ -1,6 +1,6 @@ -project(libantlr3c) -OPTION(ANTLR3_NODEBUGGER "ANTLR debugger not required" OFF) +##project(libantlr3c) +OPTION(ANTLR3_NODEBUGGER "ANTLR debugger not required" ON) SET (VERSION "3.3") SET (PACKAGE_BUGREPORT "ji...@te...") @@ -113,4 +113,5 @@ include_directories(include ${CMAKE_CURRENT_BINARY_DIR}) -add_library(antlr3c STATIC ${ANTLR3_SRCS}) +add_library(antlr3c SHARED ${ANTLR3_SRCS}) +set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") Added: branches/tora3/extlibs/parsing/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/parsing/CMakeLists.txt (rev 0) +++ branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-09 13:52:01 UTC (rev 4311) @@ -0,0 +1,33 @@ +set(PARSING_SRCS + error_handler.c + error_handler.h + macros.h + OraclePLSQLLexer.c + OraclePLSQLLexer.h + OraclePLSQLParser.c + OraclePLSQLParser.h + OracleSQLLexer.c + OracleSQLLexer.h + OracleSQLParser.c + OracleSQLParser.h + tplsqlparseoracle.cpp + tsqllexer.h + tsqllexeroracle.cpp + tsqlparse.cpp + tsqlparse.h + tsqlparseoracle.cpp + tsqlparser_export.h +) + +INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3/include + ${CMAKE_BINARY_DIR}/extlibs/libantlr3c-3.3 # generated antlr3config.h + ${CMAKE_SOURCE_DIR}/src # core/tologger.h +) + +ADD_LIBRARY(parsing SHARED ${PARSING_SRCS}) +##ADD_DEPENDENCIES(parsing tora) +SET_TARGET_PROPERTIES(parsing PROPERTIES ENABLE_EXPORTS ON) +TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c) +SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") + Property changes on: branches/tora3/extlibs/parsing/CMakeLists.txt ___________________________________________________________________ Added: svn:executable + * Modified: branches/tora3/extlibs/parsing/tsqlparseoracle.cpp =================================================================== --- branches/tora3/extlibs/parsing/tsqlparseoracle.cpp 2012-05-09 11:28:43 UTC (rev 4310) +++ branches/tora3/extlibs/parsing/tsqlparseoracle.cpp 2012-05-09 13:52:01 UTC (rev 4311) @@ -6,10 +6,10 @@ #include "antlr3input.h" #include "antlr3lexer.h" -#include "parsing/OracleSQLLexer.h" -#include "parsing/OracleSQLParser.h" +#include "OracleSQLLexer.h" +#include "OracleSQLParser.h" -#include "parsing/tsqlparse.h" +#include "tsqlparse.h" #include "core/tologger.h" #include <QPair> Modified: branches/tora3/extlibs/parsing/tsqlparser_export.h =================================================================== --- branches/tora3/extlibs/parsing/tsqlparser_export.h 2012-05-09 11:28:43 UTC (rev 4310) +++ branches/tora3/extlibs/parsing/tsqlparser_export.h 2012-05-09 13:52:01 UTC (rev 4311) @@ -16,6 +16,12 @@ #include "loki/LokiExport.h" +#if defined(parsing_EXPORTS) +# define TSQLPARSER_MAKE_DLL +#else +# define TSQLPARSER_DLL +#endif + #if (defined(TSQLPARSER_MAKE_DLL) && defined(TSQLPARSER_DLL)) || \ (defined(TSQLPARSER_MAKE_DLL) && defined(TSQLPARSER_STATIC)) || \ (defined(TSQLPARSER_DLL) && defined(TSQLPARSER_STATIC)) Modified: branches/tora3/extlibs/trotl/src/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/trotl/src/CMakeLists.txt 2012-05-09 11:28:43 UTC (rev 4310) +++ branches/tora3/extlibs/trotl/src/CMakeLists.txt 2012-05-09 13:52:01 UTC (rev 4311) @@ -36,8 +36,7 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Debug") TARGET_LINK_LIBRARIES(${LIB_NAME} ${ORACLE_LIBRARIES} ${STACK_LIB}) ELSE(CMAKE_BUILD_TYPE STREQUAL "Debug") - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ORACLE_LIBRARIES} ${STACK_LIB}) + TARGET_LINK_LIBRARIES(${LIB_NAME} ${ORACLE_LIBRARIES}) ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") - Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-05-09 11:28:43 UTC (rev 4310) +++ branches/tora3/src/CMakeLists.txt 2012-05-09 13:52:01 UTC (rev 4311) @@ -19,8 +19,6 @@ ${CMAKE_SOURCE_DIR}/extlibs/loki/include ${CMAKE_SOURCE_DIR}/extlibs/otl ${CMAKE_SOURCE_DIR}/extlibs/trotl/src - ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3/include - ${CMAKE_BINARY_DIR}/extlibs/libantlr3c-3.3 # generated antlr3config.h ${BOOST_INCLUDE_DIRS} ${QT_INCLUDES} ) @@ -647,7 +645,7 @@ ${LIBXML2_LIBRARIES} ${QSCINTILLA_LIBRARIES} ${TORA_LOKI_LIB} #static - "antlr3c" #static + "parsing" ) IF (POPPLER_QT4_FOUND) @@ -710,7 +708,7 @@ IF(USE_PCH) IF(CMAKE_GENERATOR MATCHES Visual*) - ADD_NATIVE_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) + ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test1") ELSE(CMAKE_GENERATOR MATCHES Visual*) ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) ENDIF(CMAKE_GENERATOR MATCHES Visual*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-05-09 14:54:56
|
Revision: 4312 http://tora.svn.sourceforge.net/tora/?rev=4312&view=rev Author: ibre5041 Date: 2012-05-09 14:54:45 +0000 (Wed, 09 May 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt branches/tora3/extlibs/parsing/CMakeLists.txt branches/tora3/src/CMakeLists.txt Modified: branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt 2012-05-09 13:52:01 UTC (rev 4311) +++ branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt 2012-05-09 14:54:45 UTC (rev 4312) @@ -113,5 +113,9 @@ include_directories(include ${CMAKE_CURRENT_BINARY_DIR}) -add_library(antlr3c SHARED ${ANTLR3_SRCS}) -set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") +if(WIN32) + add_library(antlr3c STATIC ${ANTLR3_SRCS}) +else(WIN32) + add_library(antlr3c SHARED ${ANTLR3_SRCS}) + set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") +endif(WIN32) Modified: branches/tora3/extlibs/parsing/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-09 13:52:01 UTC (rev 4311) +++ branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-09 14:54:45 UTC (rev 4312) @@ -25,9 +25,17 @@ ${CMAKE_SOURCE_DIR}/src # core/tologger.h ) -ADD_LIBRARY(parsing SHARED ${PARSING_SRCS}) -##ADD_DEPENDENCIES(parsing tora) +# Windows DLL cannot refer to symbols defined in the main application or in previously loaded DLLs. +# and the parsing.lib reffers to tora logging mechanism +# therefore both libs antlr3c and parsing are static on Windows, while beeing shared on Linux +# Note: if they were static on Linux they would need --whole-archive link option. +if(WIN32) + ADD_LIBRARY(parsing STATIC ${PARSING_SRCS}) +else(WIN32) + ADD_LIBRARY(parsing SHARED ${PARSING_SRCS}) + TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c) + SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") +endif(WIN32) + SET_TARGET_PROPERTIES(parsing PROPERTIES ENABLE_EXPORTS ON) -TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c) -SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-05-09 13:52:01 UTC (rev 4311) +++ branches/tora3/src/CMakeLists.txt 2012-05-09 14:54:45 UTC (rev 4312) @@ -542,18 +542,6 @@ # tooracletable.cpp ) -# LIST(APPEND TORA_SOURCES -# "parsing/tsqlparse.cpp" -# "parsing/tsqlparseoracle.cpp" -# "parsing/tplsqlparseoracle.cpp" -# "parsing/tsqllexeroracle.cpp" -# "parsing/error_handler.c" -# "parsing/OracleSQLLexer.c" -# "parsing/OracleSQLParser.c" -# "parsing/OraclePLSQLLexer.c" -# "parsing/OraclePLSQLParser.c" -# ) - IF (USE_PCH) LIST(APPEND TORA_SOURCES "stdafx.cpp") ENDIF (USE_PCH) @@ -646,6 +634,7 @@ ${QSCINTILLA_LIBRARIES} ${TORA_LOKI_LIB} #static "parsing" + "antlr3c" ) IF (POPPLER_QT4_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-05-09 15:48:32
|
Revision: 4313 http://tora.svn.sourceforge.net/tora/?rev=4313&view=rev Author: ibre5041 Date: 2012-05-09 15:48:21 +0000 (Wed, 09 May 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/extlibs/parsing/CMakeLists.txt branches/tora3/extlibs/parsing/tsqlparser_export.h branches/tora3/src/CMakeLists.txt Modified: branches/tora3/extlibs/parsing/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-09 14:54:45 UTC (rev 4312) +++ branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-09 15:48:21 UTC (rev 4313) @@ -33,9 +33,9 @@ ADD_LIBRARY(parsing STATIC ${PARSING_SRCS}) else(WIN32) ADD_LIBRARY(parsing SHARED ${PARSING_SRCS}) + SET_TARGET_PROPERTIES(parsing PROPERTIES ENABLE_EXPORTS ON) TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c) SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") endif(WIN32) -SET_TARGET_PROPERTIES(parsing PROPERTIES ENABLE_EXPORTS ON) Modified: branches/tora3/extlibs/parsing/tsqlparser_export.h =================================================================== --- branches/tora3/extlibs/parsing/tsqlparser_export.h 2012-05-09 14:54:45 UTC (rev 4312) +++ branches/tora3/extlibs/parsing/tsqlparser_export.h 2012-05-09 15:48:21 UTC (rev 4313) @@ -18,8 +18,6 @@ #if defined(parsing_EXPORTS) # define TSQLPARSER_MAKE_DLL -#else -# define TSQLPARSER_DLL #endif #if (defined(TSQLPARSER_MAKE_DLL) && defined(TSQLPARSER_DLL)) || \ Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-05-09 14:54:45 UTC (rev 4312) +++ branches/tora3/src/CMakeLists.txt 2012-05-09 15:48:21 UTC (rev 4313) @@ -697,8 +697,11 @@ IF(USE_PCH) IF(CMAKE_GENERATOR MATCHES Visual*) - ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test1") + ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" ${EXE_NAME}) +# only one target can use precompiled headers on windows - cmake is insane +# ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test1") ELSE(CMAKE_GENERATOR MATCHES Visual*) + ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) ENDIF(CMAKE_GENERATOR MATCHES Visual*) ENDIF(USE_PCH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-05-09 22:50:54
|
Revision: 4314 http://tora.svn.sourceforge.net/tora/?rev=4314&view=rev Author: ibre5041 Date: 2012-05-09 22:50:47 +0000 (Wed, 09 May 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt branches/tora3/extlibs/parsing/CMakeLists.txt branches/tora3/extlibs/parsing/tsqlparse.cpp branches/tora3/extlibs/parsing/tsqlparseoracle.cpp branches/tora3/extlibs/parsing/tsqlparser_export.h branches/tora3/src/CMakeLists.txt branches/tora3/src/core/toresultmodel.cpp branches/tora3/src/precompiled.h branches/tora3/src/tests/test1.cpp branches/tora3/src/tools/toworksheet.cpp Modified: branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/extlibs/libantlr3c-3.3/CMakeLists.txt 2012-05-09 22:50:47 UTC (rev 4314) @@ -113,9 +113,9 @@ include_directories(include ${CMAKE_CURRENT_BINARY_DIR}) -if(WIN32) - add_library(antlr3c STATIC ${ANTLR3_SRCS}) -else(WIN32) +##if(WIN32) +## add_library(antlr3c STATIC ${ANTLR3_SRCS}) +##else(WIN32) add_library(antlr3c SHARED ${ANTLR3_SRCS}) set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") -endif(WIN32) +##endif(WIN32) Modified: branches/tora3/extlibs/parsing/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-09 22:50:47 UTC (rev 4314) @@ -25,17 +25,19 @@ ${CMAKE_SOURCE_DIR}/src # core/tologger.h ) +ADD_DEFINITIONS("-DTSQLPARSER_MAKE_DLL") + # Windows DLL cannot refer to symbols defined in the main application or in previously loaded DLLs. # and the parsing.lib reffers to tora logging mechanism # therefore both libs antlr3c and parsing are static on Windows, while beeing shared on Linux # Note: if they were static on Linux they would need --whole-archive link option. -if(WIN32) - ADD_LIBRARY(parsing STATIC ${PARSING_SRCS}) -else(WIN32) +##if(WIN32) +## ADD_LIBRARY(parsing STATIC ${PARSING_SRCS}) +##else(WIN32) ADD_LIBRARY(parsing SHARED ${PARSING_SRCS}) SET_TARGET_PROPERTIES(parsing PROPERTIES ENABLE_EXPORTS ON) TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c) SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") -endif(WIN32) +##endif(WIN32) Modified: branches/tora3/extlibs/parsing/tsqlparse.cpp =================================================================== --- branches/tora3/extlibs/parsing/tsqlparse.cpp 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/extlibs/parsing/tsqlparse.cpp 2012-05-09 22:50:47 UTC (rev 4314) @@ -265,3 +265,6 @@ }; }; + +TSQLPARSER_EXPORT StatementFactTwoParmSing::PtrInstanceType StatementFactTwoParmSing::pInstance_; + Modified: branches/tora3/extlibs/parsing/tsqlparseoracle.cpp =================================================================== --- branches/tora3/extlibs/parsing/tsqlparseoracle.cpp 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/extlibs/parsing/tsqlparseoracle.cpp 2012-05-09 22:50:47 UTC (rev 4314) @@ -10,7 +10,7 @@ #include "OracleSQLParser.h" #include "tsqlparse.h" -#include "core/tologger.h" +//#include "core/tologger.h" #include <QPair> @@ -582,7 +582,7 @@ stopToken = k->toString(); if( k->getTokenType() == Token::S_COLUMN_LIST) { - TLOG(0, toNoDecorator, __HERE__) << " Dont Resolve identifier: " << i->toStringRecursive(false).toStdString() << "\t under: " << stopToken.toStdString() << std::endl; + //TLOG(0, toNoDecorator, __HERE__) << " Dont Resolve identifier: " << i->toStringRecursive(false).toStdString() << "\t under: " << stopToken.toStdString() << std::endl; insideColumnList = true; break; } @@ -600,7 +600,7 @@ continue; TokenIdentifier const& id = static_cast<TokenIdentifier const&>(*i); - TLOG(0, toNoDecorator, __HERE__) << "Resolve identifier: " << id.toStringRecursive(false).toStdString() << "\t under: " << stopToken.toStdString() << std::endl; + //TLOG(0, toNoDecorator, __HERE__) << "Resolve identifier: " << id.toStringRecursive(false).toStdString() << "\t under: " << stopToken.toStdString() << std::endl; QString schemaName, tableName, columnName; @@ -609,7 +609,7 @@ case 0: case 2: case 4: - TLOG(0, toNoDecorator, __HERE__) << " invalid length:" << id.childCount() << std::endl; + //TLOG(0, toNoDecorator, __HERE__) << " invalid length:" << id.childCount() << std::endl; break; case 1: // We have column name only @@ -636,7 +636,7 @@ } } bool columnExists = o->columnExists(cs, tableName, columnName); - TLOG(0, toNoDecorator, __HERE__) << " identifier found " << cs << '.' << tableName << '.' << columnName << ':' << columnExists << std::endl; + //TLOG(0, toNoDecorator, __HERE__) << " identifier found " << cs << '.' << tableName << '.' << columnName << ':' << columnExists << std::endl; } break; label5: @@ -649,11 +649,11 @@ columnName = id.child(4)->toStringRecursive(false).toUpper(); } bool columnExists = o->columnExists(schemaName, tableName, columnName); - TLOG(0, toNoDecorator, __HERE__) << " identifier found: " << schemaName << '.' << tableName << '.' << columnName << ':' << columnExists << std::endl; + //TLOG(0, toNoDecorator, __HERE__) << " identifier found: " << schemaName << '.' << tableName << '.' << columnName << ':' << columnExists << std::endl; } break; default: - TLOG(0, toNoDecorator, __HERE__) << " unsupported length:" << id.childCount() << std::endl; + //TLOG(0, toNoDecorator, __HERE__) << " unsupported length:" << id.childCount() << std::endl; break; } // switch(id.childCount()) // odd children should be dots. } Modified: branches/tora3/extlibs/parsing/tsqlparser_export.h =================================================================== --- branches/tora3/extlibs/parsing/tsqlparser_export.h 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/extlibs/parsing/tsqlparser_export.h 2012-05-09 22:50:47 UTC (rev 4314) @@ -16,9 +16,9 @@ #include "loki/LokiExport.h" -#if defined(parsing_EXPORTS) -# define TSQLPARSER_MAKE_DLL -#endif +//#if defined(parsing_EXPORTS) +//# define TSQLPARSER_MAKE_DLL +//#endif #if (defined(TSQLPARSER_MAKE_DLL) && defined(TSQLPARSER_DLL)) || \ (defined(TSQLPARSER_MAKE_DLL) && defined(TSQLPARSER_STATIC)) || \ Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/src/CMakeLists.txt 2012-05-09 22:50:47 UTC (rev 4314) @@ -625,6 +625,7 @@ ENDIF (MSVC) ENDIF(WIN32) +ADD_DEFINITIONS("-DTSQLPARSER_DLL") #Set up libraries to link with all found packages # dynamic @@ -697,9 +698,9 @@ IF(USE_PCH) IF(CMAKE_GENERATOR MATCHES Visual*) - ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" ${EXE_NAME}) +# ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" ${EXE_NAME}) # only one target can use precompiled headers on windows - cmake is insane -# ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test1") + ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test1") ELSE(CMAKE_GENERATOR MATCHES Visual*) ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) Modified: branches/tora3/src/core/toresultmodel.cpp =================================================================== --- branches/tora3/src/core/toresultmodel.cpp 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/src/core/toresultmodel.cpp 2012-05-09 22:50:47 UTC (rev 4314) @@ -48,7 +48,7 @@ #include "core/toeventquery.h" #include "core/toconnectiontraits.h" -#include<QDebug> +#include <QDebug> toResultModel::toResultModel(toEventQuery *query, std::list<QString> priKeys, Modified: branches/tora3/src/precompiled.h =================================================================== --- branches/tora3/src/precompiled.h 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/src/precompiled.h 2012-05-09 22:50:47 UTC (rev 4314) @@ -2,94 +2,50 @@ #pragma once // QT headers first -#include <qapplication.h> -#include <qcheckbox.h> -#include <qclipboard.h> -#include <qcolordialog.h> -#include <qcombobox.h> -#include <qcursor.h> -#include <qdatetime.h> -#include <qdialog.h> -#include <qdir.h> -#include <qevent.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qfontdialog.h> -#include <qfont.h> -#include <qglobal.h> -#include <qinputdialog.h> -#include <qkeysequence.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qmainwindow.h> -#include <qmenubar.h> -#include <qmessagebox.h> -#include <qmime.h> -#include <qmovie.h> -#include <qnamespace.h> -#include <qobject.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qpoint.h> -#include <qprinter.h> -#include <qprogressdialog.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qregexp.h> -#include <qsizepolicy.h> -#include <qspinbox.h> -#include <qsplitter.h> -#include <qsqldatabase.h> -#include <qsqlerror.h> -#include <qsqlfield.h> -#include <qsqlrecord.h> -#include <qsqlresult.h> -#include <qstatusbar.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qstyle.h> -#include <qtabwidget.h> -#include <qtextcodec.h> -#include <qtimer.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qvalidator.h> -#include <qvariant.h> -#include <qwidget.h> - #include <QAbstractItemModel> #include <QAbstractTableModel> #include <QAction> +#include <qapplication.h> #include <QApplication> #include <QBrush> #include <QButtonGroup> #include <QByteArray> #include <QChar> +#include <qcheckbox.h> #include <QCheckBox> +#include <qclipboard.h> #include <QClipboard> #include <QCloseEvent> #include <QColor> +#include <qcolordialog.h> +#include <QColorDialog> #include <QColorGroup> +#include <qcombobox.h> +#include <QComboBox> #include <QContextMenuEvent> #include <QCoreApplication> #include <QDataStream> +#include <QDate> #include <QDateTime> -// #include <QDebug> +#include <QDebug> #include <QDesktopWidget> +#include <qdialog.h> #include <QDialog> #include <QDialogButtonBox> #include <QDir> +#include <QDirModel> #include <QDockWidget> +#include <QDomDocument> #include <QDropEvent> #include <QEvent> #include <QFile> #include <QFileDialog> #include <QFileInfo> +#include <QFileSystemWatcher> #include <QFocusEvent> +#include <qfont.h> #include <QFont> +#include <qfontdialog.h> #include <QFontMetrics> #include <QFrame> #include <QGridLayout> @@ -97,13 +53,20 @@ #include <QHBoxLayout> #include <QHeaderView> #include <QHideEvent> +#include <QHostInfo> #include <QIcon> #include <QInputDialog> #include <QItemDelegate> #include <QKeyEvent> +#include <QKeySequence> +#include <qlabel.h> #include <QLabel> +#include <qlayout.h> +#include <QLayout> +#include <qlineedit.h> #include <QLineEdit> #include <QList> +#include <QListView> #include <QListWidget> #include <QLocale> #include <QMainWindow> @@ -111,77 +74,110 @@ #include <QMdiArea> #include <QMdiSubWindow> #include <QMenu> +#include <qmenubar.h> +#include <QMenuBar> +#include <qmessagebox.h> #include <QMessageBox> #include <QMetaType> #include <QMimeData> #include <QModelIndex> #include <QModelIndexList> #include <QMouseEvent> +#include <QMovie> #include <QMutex> #include <QMutexLocker> +#include <qnamespace.h> #include <QObject> +#include <qpainter.h> #include <QPainter> #include <QPaintEvent> +#include <QPair> +#include <qpalette.h> #include <QPalette> +#include <qpixmap.h> #include <QPixmap> +#include <QPixmapCache> +#include <QPlainTextEdit> #include <QPoint> #include <QPointer> #include <QPolygon> #include <QPrintDialog> +#include <qprinter.h> #include <QProgressBar> #include <QProgressDialog> #include <QPushButton> +#include <qradiobutton.h> #include <QRect> +#include <qregexp.h> #include <QRegExp> #include <QResizeEvent> +#include <Qsci/qsciabstractapis.h> +#include <Qsci/qsciapis.h> +#include <Qsci/qscilexer.h> +#include <Qsci/qscilexersql.h> +#include <Qsci/qsciprinter.h> +#include <Qsci/qsciscintilla.h> #include <QScrollArea> #include <QScrollBar> +#include <QSet> #include <QSettings> -#include <QShowEvent> #include <QSize> #include <QSortFilterProxyModel> #include <QSpacerItem> +#include <qspinbox.h> +#include <QSpinBox> +#include <qsplitter.h> #include <QSplitter> #include <QStackedWidget> #include <QStatusBar> +#include <qstring.h> #include <QString> +#include <qstringlist.h> #include <QStringList> +#include <qstyle.h> #include <QStyle> #include <QStyleFactory> #include <QStyleOptionButton> #include <QStylePainter> #include <QTableView> +#include <qtabwidget.h> #include <QTabWidget> -#include <QTcpSocket> #include <QtDebug> -#include <QTextBrowser> #include <QTextCodec> +#include <QTextDocument> #include <QTextEdit> #include <QTextStream> #include <QtGlobal> #include <QThread> #include <QThreadStorage> +#include <qtimer.h> #include <QTimer> #include <QTimerEvent> +#include <qtoolbar.h> #include <QToolBar> +#include <qtoolbutton.h> #include <QToolButton> +#include <qtooltip.h> +#include <QToolTip> #include <QTranslator> #include <QTreeView> #include <QTreeWidget> #include <QTreeWidgetItem> #include <QTreeWidgetItemIterator> -#include <QtSql> +#include <qvalidator.h> #include <QVariant> #include <QVBoxLayout> #include <QVector> #include <QWaitCondition> #include <QWidget> +#include <QXmlStreamReader> // STL headers #include <algorithm> #include <iostream> #include <map> #include <list> +#include <queue> // TOra headers //#include "toresultview.h" Modified: branches/tora3/src/tests/test1.cpp =================================================================== --- branches/tora3/src/tests/test1.cpp 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/src/tests/test1.cpp 2012-05-09 22:50:47 UTC (rev 4314) @@ -102,6 +102,7 @@ //int ret = qApp->exec(); //return ret; std::auto_ptr <SQLParser::Lexer> lexer = LexerFactTwoParmSing::Instance().create("OracleSQL", "a b c", ""); + lexer->firstWord(); } catch (const QString &str) { Modified: branches/tora3/src/tools/toworksheet.cpp =================================================================== --- branches/tora3/src/tools/toworksheet.cpp 2012-05-09 15:48:21 UTC (rev 4313) +++ branches/tora3/src/tools/toworksheet.cpp 2012-05-09 22:50:47 UTC (rev 4314) @@ -1934,7 +1934,8 @@ << "Detail for the token: " << currentToken->toString() << "\n" << "Positon: " << currentToken->getPosition().toString() << "\n" << "Token AType: " << currentToken->getTokenATypeName() << '\n' - << "Token Type: " << currentToken->getTokenTypeString() << '\n'; +// << "Token Type: " << currentToken->getTokenTypeString() << '\n' + ; QList<QString> stack; while(stackPath->parent()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-05-10 00:45:51
|
Revision: 4317 http://tora.svn.sourceforge.net/tora/?rev=4317&view=rev Author: ibre5041 Date: 2012-05-10 00:45:43 +0000 (Thu, 10 May 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/extlibs/parsing/CMakeLists.txt branches/tora3/extlibs/parsing/tsqlparser_export.h branches/tora3/src/CMakeLists.txt branches/tora3/src/core/main.cpp branches/tora3/src/precompiled.h branches/tora3/src/tests/test1.cpp branches/tora3/src/tools/toworksheet.cpp Added Paths: ----------- branches/tora3/src/core/tsqllexer.h branches/tora3/src/core/tsqlparse.cpp branches/tora3/src/core/tsqlparse.h Removed Paths: ------------- branches/tora3/extlibs/parsing/tsqllexer.h branches/tora3/extlibs/parsing/tsqlparse.cpp branches/tora3/extlibs/parsing/tsqlparse.h Modified: branches/tora3/extlibs/parsing/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-10 00:16:57 UTC (rev 4316) +++ branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-10 00:45:43 UTC (rev 4317) @@ -11,12 +11,9 @@ OracleSQLParser.c OracleSQLParser.h tplsqlparseoracle.cpp - tsqllexer.h tsqllexeroracle.cpp - tsqlparse.cpp - tsqlparse.h tsqlparseoracle.cpp - tsqlparser_export.h +## tsqlparser_export.h ) INCLUDE_DIRECTORIES( Deleted: branches/tora3/extlibs/parsing/tsqllexer.h =================================================================== --- branches/tora3/extlibs/parsing/tsqllexer.h 2012-05-10 00:16:57 UTC (rev 4316) +++ branches/tora3/extlibs/parsing/tsqllexer.h 2012-05-10 00:45:43 UTC (rev 4317) @@ -1,34 +0,0 @@ -#ifndef __TSQLLEXER__ -#define __TSQLLEXER__ - -#include "loki/Factory_alt.h" - -#include <QString> -#include <boost/iterator/iterator_facade.hpp> - -namespace SQLParser -{ -class Lexer -{ -public: - Lexer(const QString &statement, const QString &name) - : _mStatement(statement) - , _mName(name) - , _mEof(false) - {}; - - virtual QString firstWord() = 0; - virtual QString currentWord(unsigned line, unsigned column) = 0; -protected: - QString _mStatement, _mName; - bool _mEof; -}; - - -}; // namespace SQLParser - -typedef Util::GenericFactory<SQLParser::Lexer, LOKI_TYPELIST_2(const QString &, const QString&)> LexerFactTwoParm; -class LexerFactTwoParmSing: public ::Loki::SingletonHolder<LexerFactTwoParm> {}; - - -#endif Deleted: branches/tora3/extlibs/parsing/tsqlparse.cpp =================================================================== --- branches/tora3/extlibs/parsing/tsqlparse.cpp 2012-05-10 00:16:57 UTC (rev 4316) +++ branches/tora3/extlibs/parsing/tsqlparse.cpp 2012-05-10 00:45:43 UTC (rev 4317) @@ -1,270 +0,0 @@ - -#include "macros.h" -#include "tsqlparser_export.h" -#include "tsqlparse.h" - -namespace SQLParser -{ -TSQLPARSER_EXPORT const char* SQLParser::Token::TokenType2Text[] = -{ - "UNASSIGNED" - , "ROOT" - , "FAILURE" - - , "COMMENT" - , "RESERVED" - , "TABLENAME" - , "SCHEMANAME" - , "FUNCTIONNAME" - , "PROCEDURENAME" - , "PACKAGENAME" - , "BINDVARNAME" - , "CURSORNAME" - , "EXCEPTIONNAME" - , "TABLEALIAS" - , "IDENTIFIER_PART" - , "JOIN" - , "ON" - , "JOINING_CLAUSE" - , "USING" - , "VARIABLE" - , "DATATYPE" - , "PARAMETER" - , "SUBQUERY_FACTORED" - , "SUBQUERY_NESTED" - , "SUBQUERY_ALIAS" - , "UNION" - , "WITH" - , "COLUMN_LIST" - , "FROM" - , "WHERE" - , "COND_AND" - , "COND_OR" - , "IDENTIFIER" - , "TABLE_REF" - , "OPERATOR_BINARY" -}; - -TSQLPARSER_EXPORT QMap<QPair<QString, QString>, ObjectCache::TableInfo>::const_iterator ObjectCache::getTable(QString const& currentSchema, QString const& schema, QString const& table) const -{ - QMap<QPair<QString, QString>, ObjectCache::TableInfo>::const_iterator retval; - QMap<QPair<QString, QString>, QPair<QString, QString> >::const_iterator synonymTranslationNew, synonymTranslationLast = _mSynonymMap.end(); - QSet<QPair<QString, QString> > loopStack; - - // 1st try - schema is empty - if( schema.isEmpty()) - { - // 1st try (a) - schema is empty => "table" is visible in my currentSchema - retval = _mTableMap.constFind(QPair<QString, QString>(currentSchema, table)); - if( retval != _mTableMap.end()) - return retval; - - // 1st try (b) - schema is empty => "table" is local synonym in my currentSchema - synonymTranslationNew = _mSynonymMap.constFind(QPair<QString, QString>(currentSchema, table)); - // 1st try (c) - schema is empty and table was not found in currentSchema => is it PUBLIC SYNONYM? - if( synonymTranslationNew == _mSynonymMap.end()) - synonymTranslationNew = _mSynonymMap.constFind(QPair<QString, QString>(QString("PUBLIC"), table)); - - if( synonymTranslationNew != _mSynonymMap.end()) - { - loopStack.insert(*synonymTranslationNew); - - do - { - // keep previous "valid" translation - synonymTranslationLast = synonymTranslationNew; - - // check whether the synonym points onto another synonym - synonymTranslationNew = _mSynonymMap.constFind(*synonymTranslationLast); - - if( synonymTranslationNew == _mSynonymMap.end()) - // check whether synonym points onto PUBLIC synonym - synonymTranslationNew = _mSynonymMap.constFind(QPair<QString, QString>(QString("PUBLIC"), synonymTranslationLast->second)); - - if( synonymTranslationNew != _mSynonymMap.end()) // synonym translation was successfull - { - if( loopStack.contains(*synonymTranslationNew)) - return _mTableMap.end(); // Loop detected, confused -> do not return anything - else - loopStack.insert(*synonymTranslationNew); - } - } - while( synonymTranslationNew != _mSynonymMap.end()); - } - } - else // if( schema.isEmpty()) - { - // 2nd try(a) - "SCHEMA.TABLE" is a table - QMap<QPair<QString, QString>, ObjectCache::TableInfo>::const_iterator retval; - retval = _mTableMap.constFind(QPair<QString, QString>(schema, table)); - if( retval != _mTableMap.end()) - return retval; - - // 2st try (b) - "schema.table" is a synonym - QMap<QPair<QString, QString>, QPair<QString, QString> >::const_iterator synonymTranslationNew, synonymTranslationLast; - QSet<QPair<QString, QString> > loopStack; - synonymTranslationNew = _mSynonymMap.constFind(QPair<QString, QString>(schema, table)); - - if( synonymTranslationNew != _mSynonymMap.end()) - { - loopStack.insert(*synonymTranslationNew); - - do - { - // keep previous "valid" translation - synonymTranslationLast = synonymTranslationNew; - - // check whether synonym points onto another synonym - synonymTranslationNew = _mSynonymMap.constFind(*synonymTranslationLast); - - if( synonymTranslationNew != _mSynonymMap.end()) // synonym translation was successfull - { - if( loopStack.contains(*synonymTranslationNew)) - return _mTableMap.end(); // Loop detected, confised -> do not return anything - else - loopStack.insert(*synonymTranslationNew); - } - } - while( synonymTranslationNew != _mSynonymMap.end()); - } - } // if( schema.isEmpty()) else .. - - if ( synonymTranslationLast == _mSynonymMap.end()) - return _mTableMap.end(); - - retval = _mTableMap.constFind(*synonymTranslationLast); - if( retval != _mTableMap.end()) - return retval; - - return _mTableMap.end(); -}; - - -TSQLPARSER_EXPORT Token const* Statement::translateAlias(QString const& alias, Token const *context) -{ - for( SQLParser::Statement::token_const_iterator_to_root k(context); k->parent(); ++k) - { - if( k->getTokenType() == Token::S_SUBQUERY_NESTED || - k->getTokenType() == Token::S_SUBQUERY_FACTORED || - k->getTokenType() == Token::X_ROOT) - { - TokenSubquery const &s = static_cast<TokenSubquery const&>(*k); - if( s.aliasTranslation().contains(alias.toUpper())) - { - Token const* a1 = s.aliasTranslation().value(alias.toUpper()); - if( a1->getTokenType() == Token::S_TABLE_REF && a1->childCount() == 1 ) // In fact S_TABLE_REF can be alias for S_SUBQUERY_FACTORED - { - Token const* a2 = translateAlias( a1->toStringRecursive(false), &*k); - if( a2) - return a2; - } - return a1; - } - } - } - return NULL; -}; - -TSQLPARSER_EXPORT Token const* Statement::getTableRef(QString const& tableName, Token const *context) -{ - for( SQLParser::Statement::token_const_iterator_to_root k(context); k->parent(); ++k) - { - if( k->getTokenType() == Token::S_SUBQUERY_NESTED || - k->getTokenType() == Token::S_SUBQUERY_FACTORED || - k->getTokenType() == Token::X_ROOT) - { - TokenSubquery const &s = static_cast<TokenSubquery const&>(*k); - if( s.nodeTables().contains(tableName.toUpper())) - { - Token const* t1 = s.nodeTables().value(tableName.toUpper()); - Token const* t2 = s.aliasTranslation().value(tableName.toUpper()); // In fact S_TABLE_REF can be alias for S_SUBQUERY_FACTORED - if( t2) - return t2; - if( t1) - return t1; - } - } - } - return NULL; -}; - - -TSQLPARSER_EXPORT void Statement::token_const_iterator::increment() -{ - if(m_token->isLeaf()) - { - // while token has no right brother POP - while(m_token->row() == m_token->parent()->childCount() - 1) - { - m_stack.pop_back(); - m_token = m_stack.back(); - } - // replace stack's bottom with node's right brother - m_token = m_token->parent()->child(m_token->row() + 1); - m_stack.pop_back(); - m_stack.push_back(m_token); - } - else - { - m_token = m_token->child(m_lastIndex); - m_stack.push_back(m_token); - } - m_lastIndex = 0; -}; - -TSQLPARSER_EXPORT void Statement::token_const_iterator::decrement() -{ - m_lastIndex = m_token->row(); // Ugly hack - by remembering the row we do support one decrement in a row - not more - m_stack.pop_back(); - m_token = m_stack.back(); -}; - -TSQLPARSER_EXPORT bool Statement::token_const_iterator::equal(token_const_iterator const& other) const -{ - return this->m_token == other.m_token; -}; - -TSQLPARSER_EXPORT Statement::token_const_iterator Statement::begin() const -{ - return token_const_iterator(_mAST); -} - -TSQLPARSER_EXPORT Statement::token_const_iterator Statement::end() const -{ - if(_mEnd) - return token_const_iterator(_mEnd); - _mEnd = _mAST; - while(!_mEnd->isLeaf()) - { - _mEnd = _mEnd->child( _mEnd->childCount() - 1 ); - } - return token_const_iterator(_mEnd); -}; - - -TSQLPARSER_EXPORT void Statement::token_const_iterator_to_root::increment() -{ - if(m_token) - m_token = m_token->parent(); -}; - -TSQLPARSER_EXPORT bool Statement::token_const_iterator_to_root::equal(Statement::token_const_iterator_to_root const& other) const -{ - return this->m_token == other.m_token; -}; - -TSQLPARSER_EXPORT void Statement::token_iterator_to_root::increment() -{ - if(m_token) - m_token = m_token->parent(); -}; - -TSQLPARSER_EXPORT bool Statement::token_iterator_to_root::equal(Statement::token_iterator_to_root const& other) const -{ - return this->m_token == other.m_token; -}; - -}; - -TSQLPARSER_EXPORT StatementFactTwoParmSing::PtrInstanceType StatementFactTwoParmSing::pInstance_; - Deleted: branches/tora3/extlibs/parsing/tsqlparse.h =================================================================== --- branches/tora3/extlibs/parsing/tsqlparse.h 2012-05-10 00:16:57 UTC (rev 4316) +++ branches/tora3/extlibs/parsing/tsqlparse.h 2012-05-10 00:45:43 UTC (rev 4317) @@ -1,764 +0,0 @@ -#ifndef __TSQLPARSE__ -#define __TSQLPARSE__ - -#include "loki/Factory_alt.h" -#include "tsqlparser_export.h" - -#include <assert.h> -#include <QString> -#include <QList> -#include <QMap> -#include <QSet> -#include <QPointer> -#include <QVariant> -#include <QVector> - -#include <boost/iterator/iterator_facade.hpp> -#include <iostream> -#include <ostream> - -namespace SQLParser -{ -class TSQLPARSER_EXPORT Token; -class TSQLPARSER_EXPORT Statement; -class TSQLPARSER_EXPORT ParseException; - -/* each instance of T_SELECT can holds transtation map TABLE_ALIAS -> TABLE_REF */ -class TSQLPARSER_EXPORT Translation : public QMap<QString, Token*> -{ -public: - virtual ~Translation() {}; -}; - -class TSQLPARSER_EXPORT ObjectCache -{ -public: - class TableInfo - { - public: - TableInfo(QString const& schema, QString const& table, QList<QString> columns) - : _mSchema(schema) - , _mTable(table) - , _mColumns(columns) - {}; - TableInfo(TableInfo const& other) - : _mSchema(other._mSchema) - , _mTable(other._mTable) - , _mColumns(other._mColumns) - {}; - - inline QString const& schemaName() const - { - return _mSchema; - } - inline QString const& tableName() const - { - return _mTable; - }; - inline QList<QString> const& columns() const - { - return _mColumns; - }; - protected: - QString _mSchema; - QString _mTable; - QList<QString> _mColumns; - }; - - inline bool tableExists(QString const& currentSchema, QString const& schema, QString const& table) const - { - return getTable(currentSchema, schema, table) != _mTableMap.end(); - }; - - inline bool columnExists(QString const& schema, QString const& table, QString const& column) const - { - QMap<QPair<QString, QString>, TableInfo>::const_iterator t; - if( (t = getTable(schema, schema, table)) != _mTableMap.end()) - { - return t->columns().contains(column); - } - else - { - return false; - } - }; - - inline void addTable(TableInfo const& other) - { - _mTableMap.insert(QPair<QString, QString>(other.schemaName(), other.tableName()), other); - } -protected: - QMap<QPair<QString, QString>, TableInfo>::const_iterator getTable(QString const& currentSchema, QString const& schema, QString const& table) const; - - QMap<QPair<QString, QString>, TableInfo> _mTableMap; - QMap<QPair<QString, QString>, QPair<QString, QString> > _mSynonymMap; -}; - -/* - * Token's position in the source - */ -class TSQLPARSER_EXPORT Position -{ -public: - Position(unsigned line, unsigned linePos): _mLine(line), _mLinePos(linePos) {}; - Position(Position const&other): _mLine(other._mLine), _mLinePos(other._mLinePos) {}; - - inline unsigned getLine() const - { - return _mLine; - }; - inline unsigned getLinePos() const - { - return _mLinePos; - }; - inline QString toString() const - { - return QString("[%1,%2]").arg(_mLine).arg(_mLinePos); - }; - inline bool operator== (const Position &other) const - { - return _mLine == other._mLine && _mLinePos == other._mLinePos; - } - - inline bool operator!= (const Position &other) const - { - return !(*this == other); - }; - - inline bool operator< (const Position &other) const - { - return (_mLine < other._mLine) || (_mLine == other._mLine && _mLinePos < other._mLinePos); - }; - - inline bool operator> (const Position &other) const - { - return (_mLine > other._mLine) || (_mLine == other._mLine && _mLinePos > other._mLinePos); - }; -private: - unsigned _mLine, _mLinePos; -}; - -/* - * Token - an element in AST tree hierarchy - */ -class TSQLPARSER_EXPORT Token : public QObject // inherit from QObject for QPointer -{ -public: - // TreeModel methods - inline int columnCount() const - { - return 1; - }; - inline int childCount() const - { - return _mChildren.size(); - }; - inline QVariant data(int) const - { - return QVariant(toString()); - }; - inline Token* child(int row) const - { - return _mChildren.value(row); - }; - inline Token* parent() const - { - return _mParent; - }; - inline int row() const - { - if (_mParent == NULL) - return 0; - return _mParent->_mChildren.indexOf(const_cast<Token*>(this)); - }; - - enum TokenType - { - // Special node types - X_UNASSIGNED = 0, - X_ROOT, - X_FAILURE, - X_COMMENT, - // Leaf node - L_RESERVED, - L_TABLENAME, - L_SCHEMANAME, - L_FUNCTIONNAME, - L_PROCEDURENAME, - L_PACKAGENAME, - L_BINDVARNAME, - L_CURSORNAME, - L_EXCEPTIONNAME, - L_TABLEALIAS, - L_IDENTIFIER, - L_JOIN, - L_ON, - L_JOINING_CLAUSE, - L_USING, - // Leaf node (PLSQL only) - L_VARIABLE, - L_DATATYPE, - L_PARAMETER, - // Structural node types - S_SUBQUERY_FACTORED, - S_SUBQUERY_NESTED, - L_SUBQUERY_ALIAS, - S_UNION, - S_WITH, - S_COLUMN_LIST, - S_FROM, - S_WHERE, - S_COND_AND, - S_COND_OR, - S_IDENTIFIER, - S_TABLE_REF, - S_OPERATOR_BINARY - }; - - enum UsageType - { - Unknown, - Declaration, - Usage, - UsageL // Used in LVALUE - }; - - Token(Token *parent, const Position &pos, const QString &str, const TokenType& tokentype = X_UNASSIGNED) - : _mParent(parent) - , _mPosition(pos) - , _mStr(str) - , _mTokenType(tokentype) // will be overwriten by descendent - , _mUsageType(Unknown) - //, _mAlias(NULL) - {}; - - Token(const Token& other) - : _mParent(other._mParent) - , _mPosition(other._mPosition) - , _mStr(other._mStr) - , _mTokenType(other._mTokenType) // will be overwriten by descendent - , _mUsageType(other._mUsageType) - , _mTokenATypeName(other._mTokenATypeName) - , _mChildren(other._mChildren) - , _mSpaces(other._mSpaces) - { - size_t me = this->size(); - size_t oth = other.size(); - assert( this->size() >= other.size()); - }; - - virtual ~Token() - {}; - virtual size_t size() const - { - return sizeof(*this); - }; - - const Position& getPosition() const - { - return _mPosition; - }; - operator const Position&() const - { - return getPosition(); - }; - - const QString& toString() const - { - return _mStr; - }; - - operator const QString&() const - { - return toString(); - }; - QString toStringFull() const - { - QString retval(toString()); - foreach(QPointer<Token> space, _mSpaces) - { - retval += space->toString(); - } - return retval; - }; - QString toStringRecursive(bool spaces = true) const - { - QString retval( isLeaf() ? - (spaces ? toStringFull() : toString()) : - ""); - foreach(QPointer<Token> child, _mChildren) - { - retval += child->toStringRecursive(spaces); - } - return retval; - }; - - inline bool isLeaf() const - { - return _mChildren.isEmpty(); - }; - - inline const TokenType& getTokenType() const - { - return _mTokenType; - }; - inline const char* getTokenTypeString() const - { - return TokenType2Text[_mTokenType]; - }; - - inline const QString& getTokenATypeName() const - { - return _mTokenATypeName; - }; - inline void setTokenATypeName(QString const& name) - { - _mTokenATypeName = name; - }; - - inline const UsageType& getTokenUsageType() const - { - return _mUsageType; - }; - - inline void appendChild(QPointer<Token> child) - { - _mChildren.append(child); - }; - inline void appendSpacer(QPointer<Token> space) - { - _mSpaces.append(space); - }; - inline void replaceChild(int index, Token* newOne) - { - _mChildren.replace(index, newOne); - foreach(QPointer<Token> child, newOne->_mChildren) - { - child->_mParent = newOne; - } - }; - - inline QList<QPointer<Token> > const& getChildren() const - { - return _mChildren; - }; - - //inline Translation& aliasTranslation() { return _mAliasTranslation; }; - //inline Translation const& aliasTranslation() const { return _mAliasTranslation; }; - - //inline Token const* nodeAlias() const { return _mAlias; }; - //inline void setNodeAlias(Token const *t) { _mAlias = t; }; - - //inline QSet<Token*>& nodeTables() { return _mTables; }; - //inline const QSet<Token*>& nodeTables() const { return _mTables; }; -protected: - friend class Statement; - - const static char* TokenType2Text[]; - Token* _mParent; - const Position _mPosition; - const QString _mStr; - const TokenType _mTokenType; - const UsageType _mUsageType; - QString _mTokenATypeName; //ANTLR token type - for debugging purposes only - // TODO use only one of them - QList<QPointer<Token> > _mChildren; - QList<QPointer<Token> > _mSpaces; - -}; - -class TSQLPARSER_EXPORT TokenIdentifier: public Token -{ -public: - TokenIdentifier(const Token& other) - : Token(other) - , _mResolved(false) - { - size_t me = this->size(); - size_t oth = other.size(); - assert( this->size() >= other.size()); - }; - - virtual ~TokenIdentifier() - {}; - - virtual size_t size() const - { - return sizeof(*this); - }; - - QString schemaName () const; - QString tableName () const; - QString columnName () const; - - void resolve() const; - bool resolved() const - { - return _mResolved; - }; - - -protected: - bool _mResolved; -}; - -class TSQLPARSER_EXPORT TokenTable: public Token -{ -public: - TokenTable(const Token& other) - : Token(other) - , _mAlias(NULL) - { - size_t me = this->size(); - size_t oth = other.size(); - assert( this->size() >= other.size()); - }; - - virtual ~TokenTable() - {}; - - virtual size_t size() const - { - return sizeof(*this); - }; - - QString tableName () const; - QString columnName () const; - - inline Token const* nodeAlias() const - { - return _mAlias; - }; - inline void setNodeAlias(Token const *t) - { - _mAlias = t; - }; - - inline QString nodeID() const - { - return _mNodeID; - }; - inline void setNodeID(QString const &id) - { - _mNodeID = id; - }; - -protected: - /* Translate table ref SCHEMA.TABLE_A -> table alias "A" - this pointer is present only if token is of type SUBQUERY, ROOT, TABLE_REF(schema.tablename) - */ - Token const* _mAlias; - QString _mNodeID; -}; - -class TSQLPARSER_EXPORT TokenSubquery: public Token -{ -public: - TokenSubquery(Token *parent, const Position &pos, const QString &str, const TokenType& tokentype = X_UNASSIGNED) - : Token(parent, pos, str, tokentype) - , _mAlias(NULL) - {}; - - TokenSubquery(const Token& other) - : Token(other) - , _mAlias(NULL) - { - size_t me = this->size(); - size_t oth = other.size(); - assert( this->size() >= other.size()); - }; - - virtual ~TokenSubquery() {}; - virtual size_t size() const - { - return sizeof(*this); - }; - - inline Token const* nodeAlias() const - { - return _mAlias; - }; - inline void setNodeAlias(Token const *t) - { - _mAlias = t; - }; - - inline QString nodeID() const - { - return _mNodeID; - }; - inline void setNodeID(QString const &id) const - { - _mNodeID = id; - }; - - inline Translation& aliasTranslation() - { - return _mAliasTranslation; - }; - inline Translation const& aliasTranslation() const - { - return _mAliasTranslation; - }; - - inline Translation& nodeTables() - { - return _mTables; - }; - inline Translation const& nodeTables() const - { - return _mTables; - }; - -protected: - /* Translate table ref SCHEMA.TABLE_A -> table alias "A" - this pointer is present only if token is of type SUBQUERY, ROOT, TABLE_REF(schema.tablename) - */ - Token const* _mAlias; - - /* translate table alias "A" -> table ref "SCHEMA.TABLE_A" - this map is present only if token is of type SUBQUERY or ROOT - */ - Translation _mAliasTranslation; - - /* Set of tables used in a (sub)query. This list is present only if token is of type SUBQUERY or ROOT - */ - Translation _mTables; - - mutable QString _mNodeID; -}; - -class TSQLPARSER_EXPORT ParseException: public ::std::exception -{ -public: - virtual const char* what() const throw() - { - return ""; - }; -private: - -}; - -class TSQLPARSER_EXPORT Statement //: public QObject -{ - friend class ParseException; -public: - enum StatementType - { - S_SELECT, - S_UPDATE, - S_DELETE, - S_INSERT, - S_CREATE, - S_DROP, - S_ALTER, - S_BEGIN, - S_DECLARE, - S_OTHER - }; - - enum ParserState - { - P_ERROR = -1, - P_INIT = 0, - P_LEXER, // lexed - P_PARSER // parsed - }; - - Statement(const QString &statement, const QString &name) - : _mStatement(statement) - , _mname(name) - , _mState(P_INIT) - , _mAST(NULL) - , _mEnd(NULL) - {}; - - - /* Call this method after the instance is created. - It will use ObjectCache to disambiguate column names. - */ - virtual void scanTree(ObjectCache *, QString const&) = 0; - - virtual ~Statement() {}; - - void dumpTree (); - - // TreeModel methods - inline const Token* root() const - { - return _mAST; - }; - - //inline const QSet<QString>& tables() const - //{ - // return _mTablesSet; - //}; - - inline const QVector<Token const*>& tableTokens() const - { - return _mTablesList; - }; - - //inline const QSet<QString>& aliases() const - //{ - // return _mAliasesSet; - //}; - - inline const QList<QString> allDeclarations() const - { - return _mDeclarations.keys(); - }; - - inline const QList<const Token*> declarations(QString const& alias) const - { - return _mDeclarations.values(alias); - }; - - inline const QMap<QString, const Token*> declarations() const - { - return _mDeclarations; - }; - - Token const* translateAlias(QString const& alias, Token const *context); - Token const* getTableRef(QString const& tableName, Token const *context); - - class token_const_iterator : public boost::iterator_facade - < - token_const_iterator , - Token const, - boost::forward_traversal_tag - > - { - public: - token_const_iterator() : m_token(0), m_stack(), m_lastIndex(0) - {}; - - explicit token_const_iterator(Token* p) : m_token(p), m_stack(), m_lastIndex(0) - { - m_stack.push_back(p); - }; - - token_const_iterator(token_const_iterator const& other) - : m_token(other.m_token) - , m_stack(other.m_stack) - , m_lastIndex(other.m_lastIndex) - {}; - - ~token_const_iterator() {}; - - unsigned depth() const - { - return m_stack.size(); - }; - - private: - friend class boost::iterator_core_access; - - TSQLPARSER_EXPORT void increment(); - TSQLPARSER_EXPORT void decrement(); - - TSQLPARSER_EXPORT bool equal(token_const_iterator const& other) const; - - inline Token const& dereference() const - { - return *m_token; - } - - Token const* m_token; - QList<Token const*> m_stack; - int m_lastIndex; - }; // class token_const_iterator - - token_const_iterator begin() const; - token_const_iterator end() const; - - class token_const_iterator_to_root : public boost::iterator_facade - < - token_const_iterator_to_root , - Token const, - boost::forward_traversal_tag - > - { - public: - token_const_iterator_to_root() : m_token(0) {}; - - explicit token_const_iterator_to_root(Token const* p) : m_token(p) {}; - - token_const_iterator_to_root(token_const_iterator_to_root const& other) : m_token(other.m_token) {}; - - ~token_const_iterator_to_root() {}; - - inline operator Token const* () - { - return m_token; - }; - private: - friend class boost::iterator_core_access; - - TSQLPARSER_EXPORT void increment(); - - TSQLPARSER_EXPORT bool equal(token_const_iterator_to_root const& other) const; - - inline Token const& dereference() const - { - return *m_token; - } - - Token const* m_token; - }; // class token_const_iterator_to_root - - class token_iterator_to_root : public boost::iterator_facade - < - token_iterator_to_root , - Token, - boost::forward_traversal_tag - > - { - public: - token_iterator_to_root() : m_token(0) {}; - - explicit token_iterator_to_root(Token* p) : m_token(p) {}; - - token_iterator_to_root(token_iterator_to_root const& other) : m_token(other.m_token) {}; - - ~token_iterator_to_root() {}; - - inline operator Token* () - { - return m_token; - }; - private: - friend class boost::iterator_core_access; - - TSQLPARSER_EXPORT void increment(); - - TSQLPARSER_EXPORT bool equal(token_iterator_to_root const& other) const; - - inline Token& dereference() const - { - return *m_token; - } - - Token* m_token; - }; // class token_const_iterator_to_root - -protected: - QString _mStatement, _mname; - QMap<Position, Position*> _mPosition2pToken; - StatementType _mStatementType; - ParserState _mState; - virtual void parse() = 0; - QPointer<Token> _mAST; - mutable Token *_mEnd; - //QSet<QString> _mTablesSet, _mAliasesSet; - QVector<Token const*> _mTablesList; - QMap<QString, const Token*> _mDeclarations; -public: -}; - -}; // namespace SQLParser - -typedef TSQLPARSER_EXPORT Util::GenericFactory<SQLParser::Statement, LOKI_TYPELIST_2(const QString &, const QString&)> StatementFactTwoParm; -class TSQLPARSER_EXPORT StatementFactTwoParmSing: public ::Loki::SingletonHolder<StatementFactTwoParm> {}; - -#endif Modified: branches/tora3/extlibs/parsing/tsqlparser_export.h =================================================================== --- branches/tora3/extlibs/parsing/tsqlparser_export.h 2012-05-10 00:16:57 UTC (rev 4316) +++ branches/tora3/extlibs/parsing/tsqlparser_export.h 2012-05-10 00:45:43 UTC (rev 4317) @@ -1,3 +1,4 @@ +#error NOTUSED //////////////////////////////////////////////////////////////////////////////// // The Loki Library // Copyright (c) 2006 Peter K\xFCmmel Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-05-10 00:16:57 UTC (rev 4316) +++ branches/tora3/src/CMakeLists.txt 2012-05-10 00:45:43 UTC (rev 4317) @@ -203,7 +203,7 @@ core/topiechart.h core/toeditablemenu.h core/tosyntaxsetup.h - + ts_log/toostream.h shortcuteditor/shortcuteditordialog.h @@ -426,6 +426,8 @@ core/tosyntaxsetup.cpp core/tohelpsetup.cpp core/totaskrunner.cpp + + core/tsqlparse.cpp migratetool/sqldeveloper.cpp migratetool/squirrelsql.cpp Modified: branches/tora3/src/core/main.cpp =================================================================== --- branches/tora3/src/core/main.cpp 2012-05-10 00:16:57 UTC (rev 4316) +++ branches/tora3/src/core/main.cpp 2012-05-10 00:45:43 UTC (rev 4317) @@ -199,6 +199,8 @@ // if (!dlopen(*i, RTLD_NOW | RTLD_GLOBAL)) // fprintf(stderr, "Failed to load %s\n %s\n", // (const char *)(*i), dlerror()); + QLibrary parsing("parsing"); + parsing.load(); } //#endif Copied: branches/tora3/src/core/tsqllexer.h (from rev 4315, branches/tora3/extlibs/parsing/tsqllexer.h) =================================================================== --- branches/tora3/src/core/tsqllexer.h (rev 0) +++ branches/tora3/src/core/tsqllexer.h 2012-05-10 00:45:43 UTC (rev 4317) @@ -0,0 +1,35 @@ +#ifndef __TSQLLEXER__ +#define __TSQLLEXER__ + +#include "core/tora_export.h" +#include "loki/Factory_alt.h" + +#include <QString> +#include <boost/iterator/iterator_facade.hpp> + +namespace SQLParser +{ +class Lexer +{ +public: + Lexer(const QString &statement, const QString &name) + : _mStatement(statement) + , _mName(name) + , _mEof(false) + {}; + + virtual QString firstWord() = 0; + virtual QString currentWord(unsigned line, unsigned column) = 0; +protected: + QString _mStatement, _mName; + bool _mEof; +}; + + +}; // namespace SQLParser + +typedef TORA_EXPORT Util::GenericFactory<SQLParser::Lexer, LOKI_TYPELIST_2(const QString &, const QString&)> LexerFactTwoParm; +class TORA_EXPORT LexerFactTwoParmSing: public ::Loki::SingletonHolder<LexerFactTwoParm> {}; + + +#endif Copied: branches/tora3/src/core/tsqlparse.cpp (from rev 4315, branches/tora3/extlibs/parsing/tsqlparse.cpp) =================================================================== --- branches/tora3/src/core/tsqlparse.cpp (rev 0) +++ branches/tora3/src/core/tsqlparse.cpp 2012-05-10 00:45:43 UTC (rev 4317) @@ -0,0 +1,267 @@ + +#include "macros.h" +//// #include "tsqlparser_export.h" +#include "tsqlparse.h" + +namespace SQLParser +{ +const char* SQLParser::Token::TokenType2Text[] = +{ + "UNASSIGNED" + , "ROOT" + , "FAILURE" + + , "COMMENT" + , "RESERVED" + , "TABLENAME" + , "SCHEMANAME" + , "FUNCTIONNAME" + , "PROCEDURENAME" + , "PACKAGENAME" + , "BINDVARNAME" + , "CURSORNAME" + , "EXCEPTIONNAME" + , "TABLEALIAS" + , "IDENTIFIER_PART" + , "JOIN" + , "ON" + , "JOINING_CLAUSE" + , "USING" + , "VARIABLE" + , "DATATYPE" + , "PARAMETER" + , "SUBQUERY_FACTORED" + , "SUBQUERY_NESTED" + , "SUBQUERY_ALIAS" + , "UNION" + , "WITH" + , "COLUMN_LIST" + , "FROM" + , "WHERE" + , "COND_AND" + , "COND_OR" + , "IDENTIFIER" + , "TABLE_REF" + , "OPERATOR_BINARY" +}; + +QMap<QPair<QString, QString>, ObjectCache::TableInfo>::const_iterator ObjectCache::getTable(QString const& currentSchema, QString const& schema, QString const& table) const +{ + QMap<QPair<QString, QString>, ObjectCache::TableInfo>::const_iterator retval; + QMap<QPair<QString, QString>, QPair<QString, QString> >::const_iterator synonymTranslationNew, synonymTranslationLast = _mSynonymMap.end(); + QSet<QPair<QString, QString> > loopStack; + + // 1st try - schema is empty + if( schema.isEmpty()) + { + // 1st try (a) - schema is empty => "table" is visible in my currentSchema + retval = _mTableMap.constFind(QPair<QString, QString>(currentSchema, table)); + if( retval != _mTableMap.end()) + return retval; + + // 1st try (b) - schema is empty => "table" is local synonym in my currentSchema + synonymTranslationNew = _mSynonymMap.constFind(QPair<QString, QString>(currentSchema, table)); + // 1st try (c) - schema is empty and table was not found in currentSchema => is it PUBLIC SYNONYM? + if( synonymTranslationNew == _mSynonymMap.end()) + synonymTranslationNew = _mSynonymMap.constFind(QPair<QString, QString>(QString("PUBLIC"), table)); + + if( synonymTranslationNew != _mSynonymMap.end()) + { + loopStack.insert(*synonymTranslationNew); + + do + { + // keep previous "valid" translation + synonymTranslationLast = synonymTranslationNew; + + // check whether the synonym points onto another synonym + synonymTranslationNew = _mSynonymMap.constFind(*synonymTranslationLast); + + if( synonymTranslationNew == _mSynonymMap.end()) + // check whether synonym points onto PUBLIC synonym + synonymTranslationNew = _mSynonymMap.constFind(QPair<QString, QString>(QString("PUBLIC"), synonymTranslationLast->second)); + + if( synonymTranslationNew != _mSynonymMap.end()) // synonym translation was successfull + { + if( loopStack.contains(*synonymTranslationNew)) + return _mTableMap.end(); // Loop detected, confused -> do not return anything + else + loopStack.insert(*synonymTranslationNew); + } + } + while( synonymTranslationNew != _mSynonymMap.end()); + } + } + else // if( schema.isEmpty()) + { + // 2nd try(a) - "SCHEMA.TABLE" is a table + QMap<QPair<QString, QString>, ObjectCache::TableInfo>::const_iterator retval; + retval = _mTableMap.constFind(QPair<QString, QString>(schema, table)); + if( retval != _mTableMap.end()) + return retval; + + // 2st try (b) - "schema.table" is a synonym + QMap<QPair<QString, QString>, QPair<QString, QString> >::const_iterator synonymTranslationNew, synonymTranslationLast; + QSet<QPair<QString, QString> > loopStack; + synonymTranslationNew = _mSynonymMap.constFind(QPair<QString, QString>(schema, table)); + + if( synonymTranslationNew != _mSynonymMap.end()) + { + loopStack.insert(*synonymTranslationNew); + + do + { + // keep previous "valid" translation + synonymTranslationLast = synonymTranslationNew; + + // check whether synonym points onto another synonym + synonymTranslationNew = _mSynonymMap.constFind(*synonymTranslationLast); + + if( synonymTranslationNew != _mSynonymMap.end()) // synonym translation was successfull + { + if( loopStack.contains(*synonymTranslationNew)) + return _mTableMap.end(); // Loop detected, confised -> do not return anything + else + loopStack.insert(*synonymTranslationNew); + } + } + while( synonymTranslationNew != _mSynonymMap.end()); + } + } // if( schema.isEmpty()) else .. + + if ( synonymTranslationLast == _mSynonymMap.end()) + return _mTableMap.end(); + + retval = _mTableMap.constFind(*synonymTranslationLast); + if( retval != _mTableMap.end()) + return retval; + + return _mTableMap.end(); +}; + + +Token const* Statement::translateAlias(QString const& alias, Token const *context) +{ + for( SQLParser::Statement::token_const_iterator_to_root k(context); k->parent(); ++k) + { + if( k->getTokenType() == Token::S_SUBQUERY_NESTED || + k->getTokenType() == Token::S_SUBQUERY_FACTORED || + k->getTokenType() == Token::X_ROOT) + { + TokenSubquery const &s = static_cast<TokenSubquery const&>(*k); + if( s.aliasTranslation().contains(alias.toUpper())) + { + Token const* a1 = s.aliasTranslation().value(alias.toUpper()); + if( a1->getTokenType() == Token::S_TABLE_REF && a1->childCount() == 1 ) // In fact S_TABLE_REF can be alias for S_SUBQUERY_FACTORED + { + Token const* a2 = translateAlias( a1->toStringRecursive(false), &*k); + if( a2) + return a2; + } + return a1; + } + } + } + return NULL; +}; + +Token const* Statement::getTableRef(QString const& tableName, Token const *context) +{ + for( SQLParser::Statement::token_const_iterator_to_root k(context); k->parent(); ++k) + { + if( k->getTokenType() == Token::S_SUBQUERY_NESTED || + k->getTokenType() == Token::S_SUBQUERY_FACTORED || + k->getTokenType() == Token::X_ROOT) + { + TokenSubquery const &s = static_cast<TokenSubquery const&>(*k); + if( s.nodeTables().contains(tableName.toUpper())) + { + Token const* t1 = s.nodeTables().value(tableName.toUpper()); + Token const* t2 = s.aliasTranslation().value(tableName.toUpper()); // In fact S_TABLE_REF can be alias for S_SUBQUERY_FACTORED + if( t2) + return t2; + if( t1) + return t1; + } + } + } + return NULL; +}; + + + void Statement::token_const_iterator::increment() +{ + if(m_token->isLeaf()) + { + // while token has no right brother POP + while(m_token->row() == m_token->parent()->childCount() - 1) + { + m_stack.pop_back(); + m_token = m_stack.back(); + } + // replace stack's bottom with node's right brother + m_token = m_token->parent()->child(m_token->row() + 1); + m_stack.pop_back(); + m_stack.push_back(m_token); + } + else + { + m_token = m_token->child(m_lastIndex); + m_stack.push_back(m_token); + } + m_lastIndex = 0; +}; + + void Statement::token_const_iterator::decrement() +{ + m_lastIndex = m_token->row(); // Ugly hack - by remembering the row we do support one decrement in a row - not more + m_stack.pop_back(); + m_token = m_stack.back(); +}; + + bool Statement::token_const_iterator::equal(token_const_iterator const& other) const +{ + return this->m_token == other.m_token; +}; + + Statement::token_const_iterator Statement::begin() const +{ + return token_const_iterator(_mAST); +} + +Statement::token_const_iterator Statement::end() const +{ + if(_mEnd) + return token_const_iterator(_mEnd); + _mEnd = _mAST; + while(!_mEnd->isLeaf()) + { + _mEnd = _mEnd->child( _mEnd->childCount() - 1 ); + } + return token_const_iterator(_mEnd); +}; + + +void Statement::token_const_iterator_to_root::increment() +{ + if(m_token) + m_token = m_token->parent(); +}; + +bool Statement::token_const_iterator_to_root::equal(Statement::token_const_iterator_to_root const& other) const +{ + return this->m_token == other.m_token; +}; + +void Statement::token_iterator_to_root::increment() +{ + if(m_token) + m_token = m_token->parent(); +}; + +bool Statement::token_iterator_to_root::equal(Statement::token_iterator_to_root const& other) const +{ + return this->m_token == other.m_token; +}; + +}; Copied: branches/tora3/src/core/tsqlparse.h (from rev 4315, branches/tora3/extlibs/parsing/tsqlparse.h) =================================================================== --- branches/tora3/src/core/tsqlparse.h (rev 0) +++ branches/tora3/src/core/tsqlparse.h 2012-05-10 00:45:43 UTC (rev 4317) @@ -0,0 +1,764 @@ +#ifndef __TSQLPARSE__ +#define __TSQLPARSE__ + +#include "loki/Factory_alt.h" +#include "tora_export.h" + +#include <assert.h> +#include <QString> +#include <QList> +#include <QMap> +#include <QSet> +#include <QPointer> +#include <QVariant> +#include <QVector> + +#include <boost/iterator/iterator_facade.hpp> +#include <iostream> +#include <ostream> + +namespace SQLParser +{ +class Token; +class Statement; +class ParseException; + +/* each instance of T_SELECT can holds transtation map TABLE_ALIAS -> TABLE_REF */ +class Translation : public QMap<QString, Token*> +{ +public: + virtual ~Translation() {}; +}; + +class ObjectCache +{ +public: + class TableInfo + { + public: + TableInfo(QString const& schema, QString const& table, QList<QString> columns) + : _mSchema(schema) + , _mTable(table) + , _mColumns(columns) + {}; + TableInfo(TableInfo const& other) + : _mSchema(other._mSchema) + , _mTable(other._mTable) + , _mColumns(other._mColumns) + {}; + + inline QString const& schemaName() const + { + return _mSchema; + } + inline QString const& tableName() const + { + return _mTable; + }; + inline QList<QString> const& columns() const + { + return _mColumns; + }; + protected: + QString _mSchema; + QString _mTable; + QList<QString> _mColumns; + }; + + inline bool tableExists(QString const& currentSchema, QString const& schema, QString const& table) const + { + return getTable(currentSchema, schema, table) != _mTableMap.end(); + }; + + inline bool columnExists(QString const& schema, QString const& table, QString const& column) const + { + QMap<QPair<QString, QString>, TableInfo>::const_iterator t; + if( (t = getTable(schema, schema, table)) != _mTableMap.end()) + { + return t->columns().contains(column); + } + else + { + return false; + } + }; + + inline void addTable(TableInfo const& other) + { + _mTableMap.insert(QPair<QString, QString>(other.schemaName(), other.tableName()), other); + } +protected: + QMap<QPair<QString, QString>, TableInfo>::const_iterator getTable(QString const& currentSchema, QString const& schema, QString const& table) const; + + QMap<QPair<QString, QString>, TableInfo> _mTableMap; + QMap<QPair<QString, QString>, QPair<QString, QString> > _mSynonymMap; +}; + +/* + * Token's position in the source + */ +class Position +{ +public: + Position(unsigned line, unsigned linePos): _mLine(line), _mLinePos(linePos) {}; + Position(Position const&other): _mLine(other._mLine), _mLinePos(other._mLinePos) {}; + + inline unsigned getLine() const + { + return _mLine; + }; + inline unsigned getLinePos() const + { + return _mLinePos; + }; + inline QString toString() const + { + return QString("[%1,%2]").arg(_mLine).arg(_mLinePos); + }; + inline bool operator== (const Position &other) const + { + return _mLine == other._mLine && _mLinePos == other._mLinePos; + } + + inline bool operator!= (const Position &other) const + { + return !(*this == other); + }; + + inline bool operator< (const Position &other) const + { + return (_mLine < other._mLine) || (_mLine == other._mLine && _mLinePos < other._mLinePos); + }; + + inline bool operator> (const Position &other) const + { + return (_mLine > other._mLine) || (_mLine == other._mLine && _mLinePos > other._mLinePos); + }; +private: + unsigned _mLine, _mLinePos; +}; + +/* + * Token - an element in AST tree hierarchy + */ +class Token : public QObject // inherit from QObject for QPointer +{ +public: + // TreeModel methods + inline int columnCount() const + { + return 1; + }; + inline int childCount() const + { + return _mChildren.size(); + }; + inline QVariant data(int) const + { + return QVariant(toString()); + }; + inline Token* child(int row) const + { + return _mChildren.value(row); + }; + inline Token* parent() const + { + return _mParent; + }; + inline int row() const + { + if (_mParent == NULL) + return 0; + return _mParent->_mChildren.indexOf(const_cast<Token*>(this)); + }; + + enum TokenType + { + // Special node types + X_UNASSIGNED = 0, + X_ROOT, + X_FAILURE, + X_COMMENT, + // Leaf node + L_RESERVED, + L_TABLENAME, + L_SCHEMANAME, + L_FUNCTIONNAME, + L_PROCEDURENAME, + L_PACKAGENAME, + L_BINDVARNAME, + L_CURSORNAME, + L_EXCEPTIONNAME, + L_TABLEALIAS, + L_IDENTIFIER, + L_JOIN, + L_ON, + L_JOINING_CLAUSE, + L_USING, + // Leaf node (PLSQL only) + L_VARIABLE, + L_DATATYPE, + L_PARAMETER, + // Structural node types + S_SUBQUERY_FACTORED, + S_SUBQUERY_NESTED, + L_SUBQUERY_ALIAS, + S_UNION, + S_WITH, + S_COLUMN_LIST, + S_FROM, + S_WHERE, + S_COND_AND, + S_COND_OR, + S_IDENTIFIER, + S_TABLE_REF, + S_OPERATOR_BINARY + }; + + enum UsageType + { + Unknown, + Declaration, + Usage, + UsageL // Used in LVALUE + }; + + Token(Token *parent, const Position &pos, const QString &str, const TokenType& tokentype = X_UNASSIGNED) + : _mParent(parent) + , _mPosition(pos) + , _mStr(str) + , _mTokenType(tokentype) // will be overwriten by descendent + , _mUsageType(Unknown) + //, _mAlias(NULL) + {}; + + Token(const Token& other) + : _mParent(other._mParent) + , _mPosition(other._mPosition) + , _mStr(other._mStr) + , _mTokenType(other._mTokenType) // will be overwriten by descendent + , _mUsageType(other._mUsageType) + , _mTokenATypeName(other._mTokenATypeName) + , _mChildren(other._mChildren) + , _mSpaces(other._mSpaces) + { + size_t me = this->size(); + size_t oth = other.size(); + assert( this->size() >= other.size()); + }; + + virtual ~Token() + {}; + virtual size_t size() const + { + return sizeof(*this); + }; + + const Position& getPosition() const + { + return _mPosition; + }; + operator const Position&() const + { + return getPosition(); + }; + + const QString& toString() const + { + return _mStr; + }; + + operator const QString&() const + { + return toString(); + }; + QString toStringFull() const + { + QString retval(toString()); + foreach(QPointer<Token> space, _mSpaces) + { + retval += space->toString(); + } + return retval; + }; + QString toStringRecursive(bool spaces = true) const + { + QString retval( isLeaf() ? + (spaces ? toStringFull() : toString()) : + ""); + foreach(QPointer<Token> child, _mChildren) + { + retval += child->toStringRecursive(spaces); + } + return retval; + }; + + inline bool isLeaf() const + { + return _mChildren.isEmpty(); + }; + + inline const TokenType& getTokenType() const + { + return _mTokenType; + }; + inline const char* getTokenTypeString() const + { + return TokenType2Text[_mTokenType]; + }; + + inline const QString& getTokenATypeName() const + { + return _mTokenATypeName; + }; + inline void setTokenATypeName(QString const& name) + { + _mTokenATypeName = name; + }; + + inline const UsageType& getTokenUsageType() const + { + return _mUsageType; + }; + + inline void appendChild(QPointer<Token> child) + { + _mChildren.append(child); + }; + inline void appendSpacer(QPointer<Token> space) + { + _mSpaces.append(space); + }; + inline void replaceChild(int index, Token* newOne) + { + _mChildren.replace(index, newOne); + foreach(QPointer<Token> child, newOne->_mChildren) + { + child->_mParent = newOne; + } + }; + + inline QList<QPointer<Token> > const& getChildren() const + { + return _mChildren; + }; + + //inline Translation& aliasTranslation() { return _mAliasTranslation; }; + //inline Translation const& aliasTranslation() const { return _mAliasTranslation; }; + + //inline Token const* nodeAlias() const { return _mAlias; }; + //inline void setNodeAlias(Token const *t) { _mAlias = t; }; + + //inline QSet<Token*>& nodeTables() { return _mTables; }; + //inline const QSet<Token*>& nodeTables() const { return _mTables; }; +protected: + friend class Statement; + + const static char* TokenType2Text[]; + Token* _mParent; + const Position _mPosition; + const QString _mStr; + const TokenType _mTokenType; + const UsageType _mUsageType; + QString _mTokenATypeName; //ANTLR token type - for debugging purposes only + // TODO use only one of them + QList<QPointer<Token> > _mChildren; + QList<QPointer<Token> > _mSpaces; + +}; + +class TokenIdentifier: public Token +{ +public: + TokenIdentifier(const Token& other) + : Token(other) + , _mResolved(false) + { + size_t me = this->size(); + size_t oth = other.size(); + assert( this->size() >= other.size()); + }; + + virtual ~TokenIdentifier() + {}; + + virtual size_t size() const + { + return sizeof(*this); + }; + + QString schemaName () const; + QString tableName () const; + QString columnName () const; + + void resolve() const; + bool resolved() const + { + return _mResolved; + }; + + +protected: + bool _mResolved; +}; + +class TokenTable: public Token +{ +public: + TokenTable(const Token& other) + : Token(other) + , _mAlias(NULL) + { + size_t me = this->size(); + size_t oth = other.size(); + assert( this->size() >= other.size()); + }; + + virtual ~TokenTable() + {}; + + virtual size_t size() const + { + return sizeof(*this); + }; + + QString tableName () const; + QString columnName () const; + + inline Token const* nodeAlias() const + { + return _mAlias; + }; + inline void setNodeAlias(Token const *t) + { + _mAlias = t; + }; + + inline QString nodeID() const + { + return _mNodeID; + }; + inline void setNodeID(QString const &id) + { + _mNodeID = id; + }; + +protected: + /* Translate table ref SCHEMA.TABLE_A -> table alias "A" + this pointer is present only if token is of type SUBQUERY, ROOT, TABLE_REF(schema.tablename) + */ + Token const* _mAlias; + QString _mNodeID; +}; + +class TokenSubquery: public Token +{ +public: + TokenSubquery(Token *parent, const Position &pos, const QString &str, const TokenType& tokentype = X_UNASSIGNED) + : Token(parent, pos, str, tokentype) + , _mAlias(NULL) + {}; + + TokenSubquery(const Token& other) + : Token(other) + , _mAlias(NULL) + { + size_t me = this->size(); + size_t oth = other.size(); + assert( this->size() >= other.size()); + }; + + virtual ~TokenSubquery() {}; + virtual size_t size() const + { + return sizeof(*this); + }; + + inline Token const* nodeAlias() const + { + return _mAlias; + }; + inline void setNodeAlias(Token const *t) + { + _mAlias = t; + }; + + inline QString nodeID() const + { + return _mNodeID; + }; + inline void setNodeID(QString const &id) const + { + _mNodeID = id; + }; + + inline Translation& aliasTranslation() + { + return _mAliasTranslation; + }; + inline Translation const& aliasTranslation() const + { + return _mAliasTranslation; + }; + + inline Translation& nodeTables() + { + return _mTables; + }; + inline Translation const& nodeTables() const + { + return _mTables; + }; + +protected: + /* Translate table ref SCHEMA.TABLE_A -> table alias "A" + this pointer is present only if token is of type SUBQUERY, ROOT, TABLE_REF(schema.tablename) + */ + Token const* _mAlias; + + /* translate table alias "A" -> table ref "SCHEMA.TABLE_A" + this map is present only if token is of type SUBQUERY or ROOT + */ + Translation _mAliasTranslation; + + /* Set of tables used in a (sub)query. This list is present only if token is of type SUBQUERY or ROOT + */ + Translation _mTables; + + mutable QString _mNodeID; +}; + +class ParseException: public ::std::exception +{ +public: + virtual const char* what() const throw() + { + return ""; + }; +private: + +}; + +class Statement //: public QObject +{ + friend class ParseException; +public: + enum StatementType + { + S_SELECT, + S_UPDATE, + S_DELETE, + S_INSERT, + S_CREATE, + S_DROP, + S_ALTER, + S_BEGIN, + S_DECLARE, + S_OTHER + }; + + enum ParserState + { + P_ERROR = -1, + P_INIT = 0, + P_LEXER, // lexed + P_PARSER // parsed + }; + + Statement(const QString &statement, const QString &name) + : _mStatement(statement) + , _mname(name) + , _mState(P_INIT) + , _mAST(NULL) + , _mEnd(NULL) + {}; + + + /* Call this method after the instance is created. + It will use ObjectCache to disambiguate column names. + */ + virtual void scanTree(ObjectCache *, QString const&) = 0; + + virtual ~Statement() {}; + + void dumpTree (); + + // TreeModel methods + inline const Token* root() const + { + return _mAST; + }; + + //inline const QSet<QString>& tables() const + //{ + // return _mTablesSet; + //}; + + inline const QVector<Token const*>& tableTokens() const + { + return _mTablesList; + }; + + //inline const QSet<QString>& aliases() const + //{ + // return _mAliasesSet; + //}; + + inline const QList<QString> allDeclarations() const + { + return _mDeclarations.keys(); + }; + + inline const QList<const Token*> declarations(QString const& alias) const + { + return _mDeclarations.values(alias); + }; + + inline const QMap<QString, const Token*> declarations() const + { + return _mDeclarations; + }; + + Token const* translateAlias(QString const& alias, Token const *context); + Token const* getTableRef(QString const& tableName, Token const *context); + + class token_const_iterator : public boost::iterator_facade + < + token_const_iterator , + Token const, + boost::forward_traversal_tag + > + { + public: + token_const_iterator() : m_token(0), m_stack(), m_lastIndex(0) + {}; + + explicit token_const_iterator(Token* p) : m_token(p), m_stack(), m_lastIndex(0) + { + m_stack.push_back(p); + }; + + token_const_iterator(token_const_iterator const& other) + : m_token(other.m_token) + , m_stack(other.m_stack) + , m_lastIndex(other.m_lastIndex) + {}; + + ~token_const_iterator() {}; + + unsigned depth() const + { + return m_stack.size(); + }; + + private: + friend class boost::iterator_core_access; + + void increment(); + void decrement(); + + bool equal(token_const_iterator const& other) const; + + inline Token const& dereference() const + { + return *m_token; + } + + Token const* m_token; + QList<Token const*> m_stack; + int m_lastIndex; + }; // class token_const_iterator + + token_const_iterator begin() const; + token_const_iterator end() const; + + class token_const_iterator_to_root : public boost::iterator_facade +... [truncated message content] |
From: <ibr...@us...> - 2012-05-10 17:06:20
|
Revision: 4318 http://tora.svn.sourceforge.net/tora/?rev=4318&view=rev Author: ibre5041 Date: 2012-05-10 17:06:14 +0000 (Thu, 10 May 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/extlibs/parsing/CMakeLists.txt branches/tora3/extlibs/parsing/tplsqlparseoracle.cpp branches/tora3/extlibs/parsing/tsqllexeroracle.cpp branches/tora3/extlibs/parsing/tsqlparseoracle.cpp branches/tora3/src/core/main.cpp branches/tora3/src/core/tsqlparse.cpp branches/tora3/src/core/tsqlparse.h Modified: branches/tora3/extlibs/parsing/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-10 00:45:43 UTC (rev 4317) +++ branches/tora3/extlibs/parsing/CMakeLists.txt 2012-05-10 17:06:14 UTC (rev 4318) @@ -33,7 +33,7 @@ ##else(WIN32) ADD_LIBRARY(parsing SHARED ${PARSING_SRCS}) SET_TARGET_PROPERTIES(parsing PROPERTIES ENABLE_EXPORTS ON) - TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c) + TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c tora) SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") ##endif(WIN32) Modified: branches/tora3/extlibs/parsing/tplsqlparseoracle.cpp =================================================================== --- branches/tora3/extlibs/parsing/tplsqlparseoracle.cpp 2012-05-10 00:45:43 UTC (rev 4317) +++ branches/tora3/extlibs/parsing/tplsqlparseoracle.cpp 2012-05-10 17:06:14 UTC (rev 4318) @@ -8,7 +8,7 @@ #include "OraclePLSQLLexer.h" #include "OraclePLSQLParser.h" -#include "tsqlparse.h" +#include "core/tsqlparse.h" namespace SQLParser { Modified: branches/tora3/extlibs/parsing/tsqllexeroracle.cpp =================================================================== --- branches/tora3/extlibs/parsing/tsqllexeroracle.cpp 2012-05-10 00:45:43 UTC (rev 4317) +++ branches/tora3/extlibs/parsing/tsqllexeroracle.cpp 2012-05-10 17:06:14 UTC (rev 4318) @@ -5,8 +5,8 @@ #include "antlr3lexer.h" #include "OracleSQLLexer.h" -#include "tsqllexer.h" -#include "tsqlparse.h" +#include "core/tsqllexer.h" +#include "core/tsqlparse.h" namespace SQLParser { Modified: branches/tora3/extlibs/parsing/tsqlparseoracle.cpp =================================================================== --- branches/tora3/extlibs/parsing/tsqlparseoracle.cpp 2012-05-10 00:45:43 UTC (rev 4317) +++ branches/tora3/extlibs/parsing/tsqlparseoracle.cpp 2012-05-10 17:06:14 UTC (rev 4318) @@ -9,7 +9,7 @@ #include "OracleSQLLexer.h" #include "OracleSQLParser.h" -#include "tsqlparse.h" +#include "core/tsqlparse.h" //#include "core/tologger.h" #include <QPair> Modified: branches/tora3/src/core/main.cpp =================================================================== --- branches/tora3/src/core/main.cpp 2012-05-10 00:45:43 UTC (rev 4317) +++ branches/tora3/src/core/main.cpp 2012-05-10 17:06:14 UTC (rev 4318) @@ -78,6 +78,7 @@ #include <QString> #include <QTranslator> #include <QStyleFactory> +#include <QLibrary> //#include <QFont> //#include <QTextCodec> Modified: branches/tora3/src/core/tsqlparse.cpp =================================================================== --- branches/tora3/src/core/tsqlparse.cpp 2012-05-10 00:45:43 UTC (rev 4317) +++ branches/tora3/src/core/tsqlparse.cpp 2012-05-10 17:06:14 UTC (rev 4318) @@ -1,7 +1,7 @@ #include "macros.h" //// #include "tsqlparser_export.h" -#include "tsqlparse.h" +#include "core/tsqlparse.h" namespace SQLParser { @@ -139,7 +139,6 @@ return _mTableMap.end(); }; - Token const* Statement::translateAlias(QString const& alias, Token const *context) { for( SQLParser::Statement::token_const_iterator_to_root k(context); k->parent(); ++k) Modified: branches/tora3/src/core/tsqlparse.h =================================================================== --- branches/tora3/src/core/tsqlparse.h 2012-05-10 00:45:43 UTC (rev 4317) +++ branches/tora3/src/core/tsqlparse.h 2012-05-10 17:06:14 UTC (rev 4318) @@ -1,6 +1,12 @@ #ifndef __TSQLPARSE__ #define __TSQLPARSE__ +#pragma warning(push) +// some warnings still occur at this level +// if necessary, disable specific warnings not covered by previous pragma +#pragma warning(disable:4800) +#pragma warning(disable:4251) + #include "loki/Factory_alt.h" #include "tora_export.h" @@ -14,6 +20,7 @@ #include <QVector> #include <boost/iterator/iterator_facade.hpp> + #include <iostream> #include <ostream> @@ -24,13 +31,13 @@ class ParseException; /* each instance of T_SELECT can holds transtation map TABLE_ALIAS -> TABLE_REF */ -class Translation : public QMap<QString, Token*> +class TORA_EXPORT Translation : public QMap<QString, Token*> { public: virtual ~Translation() {}; }; -class ObjectCache +class TORA_EXPORT ObjectCache { public: class TableInfo @@ -97,7 +104,7 @@ /* * Token's position in the source */ -class Position +class TORA_EXPORT Position { public: Position(unsigned line, unsigned linePos): _mLine(line), _mLinePos(linePos) {}; @@ -141,7 +148,7 @@ /* * Token - an element in AST tree hierarchy */ -class Token : public QObject // inherit from QObject for QPointer +class TORA_EXPORT Token : public QObject // inherit from QObject for QPointer { public: // TreeModel methods @@ -367,7 +374,7 @@ }; -class TokenIdentifier: public Token +class TORA_EXPORT TokenIdentifier: public Token { public: TokenIdentifier(const Token& other) @@ -402,7 +409,7 @@ bool _mResolved; }; -class TokenTable: public Token +class TORA_EXPORT TokenTable: public Token { public: TokenTable(const Token& other) @@ -451,7 +458,7 @@ QString _mNodeID; }; -class TokenSubquery: public Token +class TORA_EXPORT TokenSubquery: public Token { public: TokenSubquery(Token *parent, const Position &pos, const QString &str, const TokenType& tokentype = X_UNASSIGNED) @@ -528,7 +535,7 @@ mutable QString _mNodeID; }; -class ParseException: public ::std::exception +class TORA_EXPORT ParseException: public ::std::exception { public: virtual const char* what() const throw() @@ -539,7 +546,7 @@ }; -class Statement //: public QObject +class TORA_EXPORT Statement //: public QObject { friend class ParseException; public: @@ -579,7 +586,7 @@ */ virtual void scanTree(ObjectCache *, QString const&) = 0; - virtual ~Statement() {}; + virtual ~Statement() {}; void dumpTree (); @@ -654,10 +661,10 @@ private: friend class boost::iterator_core_access; - void increment(); - void decrement(); + void TORA_EXPORT increment(); + void TORA_EXPORT decrement(); - bool equal(token_const_iterator const& other) const; + bool TORA_EXPORT equal(token_const_iterator const& other) const; inline Token const& dereference() const { @@ -730,7 +737,7 @@ private: friend class boost::iterator_core_access; - void increment(); + TORA_EXPORT void increment(); bool equal(token_iterator_to_root const& other) const; @@ -761,4 +768,7 @@ typedef TORA_EXPORT Util::GenericFactory<SQLParser::Statement, LOKI_TYPELIST_2(const QString &, const QString&)> StatementFactTwoParm; class TORA_EXPORT StatementFactTwoParmSing: public ::Loki::SingletonHolder<StatementFactTwoParm> {}; +// restore warning level +#pragma warning(pop) + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-06-19 18:23:31
|
Revision: 4357 http://tora.svn.sourceforge.net/tora/?rev=4357&view=rev Author: ibre5041 Date: 2012-06-19 18:23:21 +0000 (Tue, 19 Jun 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/extlibs/trotl/src/trotl_describe.h branches/tora3/extlibs/trotl/src/trotl_stat.cpp branches/tora3/src/connection/tooracleconnection.cpp branches/tora3/src/connection/tooracleconnection.h branches/tora3/src/core/tocache.cpp branches/tora3/src/core/tocache.h branches/tora3/src/core/toconnectionsub.h branches/tora3/src/core/toresultcols.cpp Modified: branches/tora3/extlibs/trotl/src/trotl_describe.h =================================================================== --- branches/tora3/extlibs/trotl/src/trotl_describe.h 2012-06-18 23:36:42 UTC (rev 4356) +++ branches/tora3/extlibs/trotl/src/trotl_describe.h 2012-06-19 18:23:21 UTC (rev 4357) @@ -254,7 +254,7 @@ protected: friend class Describe; DescribeSynonym(OciConnection &, OciDescribe&, const tstring &objectName, bool); -private: +public: tstring _name, _schema, _link; bool _public; ub4 _objid; @@ -283,6 +283,7 @@ protected: friend class Describe; DescribeView(OciConnection &, OciDescribe&, const tstring &objectName); +public: ub4 _objid; ub2 _num_cols; ub1 _is_typed; @@ -311,6 +312,7 @@ protected: friend class Describe; DescribeTable(OciConnection& conn, OciDescribe &desc, const tstring &objectName); +public: ub4 _objid; ub2 _num_cols; OciParam _list_columns; @@ -405,10 +407,11 @@ friend class Describe; friend class DescribeColumn; -//protected: +protected: DescribeType(OciConnection& conn, const tstring &objectName); DescribeType(OciConnection &con, OciDescribe &desc, const tstring &objectName); DescribeType(OciConnection &con, OciParam ¶m, const tstring &columnName); +public: OCITypeCode _typecode; OCITypeCode _collection_typecode; ub1 _is_incomplete_type; @@ -455,6 +458,7 @@ protected: friend class Describe; DescribeSequence(OciConnection &con, OciDescribe &desc, const tstring &objectName); +public: ub4 _objid; SqlNumber _min; SqlNumber _max; Modified: branches/tora3/extlibs/trotl/src/trotl_stat.cpp =================================================================== --- branches/tora3/extlibs/trotl/src/trotl_stat.cpp 2012-06-18 23:36:42 UTC (rev 4356) +++ branches/tora3/extlibs/trotl/src/trotl_stat.cpp 2012-06-19 18:23:21 UTC (rev 4357) @@ -53,7 +53,7 @@ { -int TROTL_EXPORT g_OCIPL_BULK_ROWS = 3; +int TROTL_EXPORT g_OCIPL_BULK_ROWS = 4096; int TROTL_EXPORT g_OCIPL_MAX_LONG = 0x20000; //128 KB const char TROTL_EXPORT *g_TROTL_DEFAULT_NUM_FTM = "TM"; const char TROTL_EXPORT *g_TROTL_DEFAULT_DATE_FTM = "YYYY:MM:DD HH24:MI:SS"; Modified: branches/tora3/src/connection/tooracleconnection.cpp =================================================================== --- branches/tora3/src/connection/tooracleconnection.cpp 2012-06-18 23:36:42 UTC (rev 4356) +++ branches/tora3/src/connection/tooracleconnection.cpp 2012-06-19 18:23:21 UTC (rev 4357) @@ -57,6 +57,7 @@ #include "trotl.h" #include "trotl_convertor.h" +#include "trotl_describe.h" #include <QInputDialog> #include <QLineEdit> @@ -311,3 +312,55 @@ { return new oracleQuery(query, this); } + +toQColumnDescriptionList* toOracleConnectionSub::decribe(toCache::ObjectRef const& objectName) +{ + toQColumnDescriptionList *retval = new toQColumnDescriptionList(); + ::trotl::Describe *d = ::trotl::Describe::createDescription(*_conn, qPrintable(objectName.toString())); + + switch (d->whatIsThis()) { + case ::trotl::Describe::O_SYNONYM: + break; + case ::trotl::Describe::O_PUBLIC_SYNONYM: + ;; + break; + case ::trotl::Describe::O_VIEW: + ;; + break; + case ::trotl::Describe::O_TABLE: + { + trotl::DescribeTable *t = static_cast<trotl::DescribeTable*>(d); + foreach(::trotl::DescribeColumn *dc, t->_columns) + { + toCache::ColumnDescription *c = new toCache::ColumnDescription(); + c->Name = dc->_name.c_str(); + c->Null = dc->_is_null; + c->Datatype = dc->_type_name.c_str(); + c->ToolTip = dc->toString().c_str(); + } + } + break; + case ::trotl::Describe::O_COLUMN: + ;; + break; + case ::trotl::Describe::O_TYPE: + ;; + break; + case ::trotl::Describe::O_SEQUENCE: + ;; + break; + case ::trotl::Describe::O_PROCEDURE: + ;; + break; + case ::trotl::Describe::O_FUNCTION: + ;; + break; + case ::trotl::Describe::O_PACKAGE: + ;; + break; + default: + break; + } + + return retval; +} Modified: branches/tora3/src/connection/tooracleconnection.h =================================================================== --- branches/tora3/src/connection/tooracleconnection.h 2012-06-18 23:36:42 UTC (rev 4356) +++ branches/tora3/src/connection/tooracleconnection.h 2012-06-19 18:23:21 UTC (rev 4357) @@ -95,6 +95,8 @@ virtual void rollback(); virtual queryImpl* createQuery(toQuery *query); + virtual toQColumnDescriptionList* decribe(toCache::ObjectRef const&); + private: ::trotl::OciConnection *_conn; ::trotl::OciLogin *_login; Modified: branches/tora3/src/core/tocache.cpp =================================================================== --- branches/tora3/src/core/tocache.cpp 2012-06-18 23:36:42 UTC (rev 4356) +++ branches/tora3/src/core/tocache.cpp 2012-06-19 18:23:21 UTC (rev 4357) @@ -58,6 +58,13 @@ QDataStream& operator<< (QDataStream& stream, const toCache::CacheEntry& e); QDataStream& operator>> (QDataStream& stream, toCache::CacheEntry& e); +QString toCache::ObjectRef::toString() const +{ + if( first.isEmpty()) + return second; + return QString(first) + '.' + second; +} + toCache::toCache(toConnection &parentConnection, QString const &description) : QObject(NULL) , ConnectionDescription(description) Modified: branches/tora3/src/core/tocache.h =================================================================== --- branches/tora3/src/core/tocache.h 2012-06-18 23:36:42 UTC (rev 4356) +++ branches/tora3/src/core/tocache.h 2012-06-19 18:23:21 UTC (rev 4357) @@ -42,6 +42,8 @@ #define TOCACHE_NEW_H #include "core/tothread.h" +#include "core/tora_export.h" + #include <QMetaType> #include <QDate> #include <QList> @@ -71,7 +73,7 @@ class QFileInfo; class QDir; -class toCache : public QObject +class TORA_EXPORT toCache : public QObject { Q_OBJECT; @@ -82,8 +84,23 @@ /** Object reference, used as a lookup key */ - typedef QPair<QString, QString> ObjectRef; // 1st schema name, 2nd object name + class TORA_EXPORT ObjectRef : public QPair<QString, QString> // 1st schema name, 2nd object name + { + typedef QPair<QString, QString> super; + public: + ObjectRef() : super() {}; + ObjectRef(const super::first_type &t1, const super::second_type &t2) : super(t1, t2) {}; + ObjectRef &operator=(const QPair<super::second_type, super::second_type> &other) + { first = other.first; second = other.second; return *this; } + + /** convert object reference into a string */ + QString toString() const; + + /** convert object reference into a string, use connection traits quoting mechanism*/ + ////QString toString(toConnection &con) const; + }; + /** Nested class type */ enum CacheEntryType : quint8 @@ -181,6 +198,8 @@ /** Comment on column (Only filled out in column cache. */ QString Comment; + + QString ToolTip; }; // struct ColumnDescription //typedef QList<QVariant> Row; // NOTE: first (0th) value in a row is a row number (see variable currRowKey) Modified: branches/tora3/src/core/toconnectionsub.h =================================================================== --- branches/tora3/src/core/toconnectionsub.h 2012-06-18 23:36:42 UTC (rev 4356) +++ branches/tora3/src/core/toconnectionsub.h 2012-06-19 18:23:21 UTC (rev 4357) @@ -1,6 +1,8 @@ #ifndef TOCONNECTIONSUB #define TOCONNECTIONSUB +#include "core/tocache.h" + #include <QDateTime> class queryImpl; @@ -59,6 +61,8 @@ virtual queryImpl* createQuery(toQuery *query) = 0; + virtual toQColumnDescriptionList* decribe(toCache::ObjectRef const&) = 0; + void execute(QString const& SQL); /** Set time when last query on this connection has finished to "now" */ Modified: branches/tora3/src/core/toresultcols.cpp =================================================================== --- branches/tora3/src/core/toresultcols.cpp 2012-06-18 23:36:42 UTC (rev 4356) +++ branches/tora3/src/core/toresultcols.cpp 2012-06-19 18:23:21 UTC (rev 4357) @@ -57,42 +57,42 @@ #include <QScrollArea> #include <QApplication> -static toSQL SQLComment( - "toResultCols:Comments", - "SELECT Column_name,Comments FROM sys.All_Col_Comments\n" - " WHERE Owner = :f1<char[100]>\n" - " AND Table_Name = :f2<char[100]>", - "Display column comments"); +//static toSQL SQLComment( +// "toResultCols:Comments", +// "SELECT Column_name,Comments FROM sys.All_Col_Comments\n" +// " WHERE Owner = :f1<char[100]>\n" +// " AND Table_Name = :f2<char[100]>", +// "Display column comments"); -static toSQL SQLCommentPG( - "toResultCols:Comments", - "SELECT a.attname,\n" - " pg_catalog.col_description ( a.attrelid,\n" - " a.attnum )\n" - " FROM pg_catalog.pg_attribute a,\n" - " pg_class c,\n" - " pg_namespace n\n" - " WHERE n.nspname = :f1<char[100]>\n" - " AND c.relname = :f2<char[100]>\n" - " AND c.relkind = 'r'::\"char\"\n" - " AND c.relnamespace = n.OID\n" - " AND a.attrelid = c.OID\n" - " AND a.attnum > 0\n" - " AND NOT a.attisdropped", - "", - "7.1", - "PostgreSQL"); +//static toSQL SQLCommentPG( +// "toResultCols:Comments", +// "SELECT a.attname,\n" +// " pg_catalog.col_description ( a.attrelid,\n" +// " a.attnum )\n" +// " FROM pg_catalog.pg_attribute a,\n" +// " pg_class c,\n" +// " pg_namespace n\n" +// " WHERE n.nspname = :f1<char[100]>\n" +// " AND c.relname = :f2<char[100]>\n" +// " AND c.relkind = 'r'::\"char\"\n" +// " AND c.relnamespace = n.OID\n" +// " AND a.attrelid = c.OID\n" +// " AND a.attnum > 0\n" +// " AND NOT a.attisdropped", +// "", +// "7.1", +// "PostgreSQL"); -static toSQL SQLCommentTD( - "toResultCols:Comments", - "SELECT c.columnname,\n" - " c.commentstring\n" - " FROM dbc.COLUMNS c\n" - " WHERE trim ( databasename ) = trim ( :f1<char[100]> )\n" - " AND trim ( tablename ) = trim ( :f2<char[100]> )", - "", - "", - "Teradata"); +//static toSQL SQLCommentTD( +// "toResultCols:Comments", +// "SELECT c.columnname,\n" +// " c.commentstring\n" +// " FROM dbc.COLUMNS c\n" +// " WHERE trim ( databasename ) = trim ( :f1<char[100]> )\n" +// " AND trim ( tablename ) = trim ( :f2<char[100]> )", +// "", +// "", +// "Teradata"); static toSQL SQLTableCommentMySQL( "toResultCols:TableComment", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-06-28 15:35:38
|
Revision: 4377 http://tora.svn.sourceforge.net/tora/?rev=4377&view=rev Author: ibre5041 Date: 2012-06-28 15:35:28 +0000 (Thu, 28 Jun 2012) Log Message: ----------- single element selection Modified Paths: -------------- branches/tora3/extlibs/libermodel/dotgraphview.cpp branches/tora3/extlibs/libermodel/dotgraphview.h branches/tora3/extlibs/parsing/CMakeLists.txt branches/tora3/src/tools/toer.cpp Modified: branches/tora3/extlibs/libermodel/dotgraphview.cpp =================================================================== --- branches/tora3/extlibs/libermodel/dotgraphview.cpp 2012-06-28 12:43:53 UTC (rev 4376) +++ branches/tora3/extlibs/libermodel/dotgraphview.cpp 2012-06-28 15:35:28 UTC (rev 4377) @@ -67,6 +67,8 @@ #include <QApplication> #include <QFileDialog> +#include <QMessageBox> // TODO just a test - remove me + ///#include <kdebug.h> ///#include <klocale.h> ///#include <kfiledialog.h> @@ -920,6 +922,15 @@ else if (m_editingMode == SelectingElements) { } + else if (m_editingMode == SelectSingleElement) + { + QGraphicsItem *i = itemAt(e->pos()); + if (CanvasElement *cei = dynamic_cast<CanvasElement*>(i)) + { + QString id = cei->element()->id(); + QMessageBox::information(NULL, tr("Selected table:"), id); + } + } else { if (m_editingMode != None && itemAt(e->pos()) == 0) // click outside any item: unselect all @@ -1643,6 +1654,13 @@ setDragMode ( RubberBandDrag ); } +void DotGraphView::prepareSelectSinlgeElement() +{ + ///kDebug(); + m_editingMode = SelectSingleElement; + setCursor(Qt::OpenHandCursor); +} + void DotGraphView::createNewEdgeDraftFrom(CanvasElement* node) { ///kDebug() << node->element()->id(); Modified: branches/tora3/extlibs/libermodel/dotgraphview.h =================================================================== --- branches/tora3/extlibs/libermodel/dotgraphview.h 2012-06-28 12:43:53 UTC (rev 4376) +++ branches/tora3/extlibs/libermodel/dotgraphview.h 2012-06-28 15:35:28 UTC (rev 4377) @@ -76,7 +76,7 @@ Q_OBJECT public: - enum EditingMode { None, AddNewElement, AddNewEdge, DrawNewEdge, SelectingElements }; + enum EditingMode { None, AddNewElement, AddNewEdge, DrawNewEdge, SelectingElements, SelectSingleElement }; enum ScrollDirection { Here, Left, Right, Top, Bottom }; explicit DotGraphView(QActionGroup* actions, QWidget* parent=0); @@ -134,6 +134,7 @@ void prepareAddNewElement(QMap<QString,QString> attribs); void prepareAddNewEdge(QMap<QString,QString> attribs); void prepareSelectElements(); + void prepareSelectSinlgeElement(); void createNewEdgeDraftFrom(CanvasElement* node); void finishNewEdgeTo(CanvasElement* node); Modified: branches/tora3/extlibs/parsing/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/parsing/CMakeLists.txt 2012-06-28 12:43:53 UTC (rev 4376) +++ branches/tora3/extlibs/parsing/CMakeLists.txt 2012-06-28 15:35:28 UTC (rev 4377) @@ -34,6 +34,7 @@ ADD_LIBRARY(parsing SHARED ${PARSING_SRCS}) SET_TARGET_PROPERTIES(parsing PROPERTIES ENABLE_EXPORTS ON) TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c tora) +# TARGET_LINK_LIBRARIES(parsing ${QT_LIBRARIES} antlr3c test2) SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") ##endif(WIN32) Modified: branches/tora3/src/tools/toer.cpp =================================================================== --- branches/tora3/src/tools/toer.cpp 2012-06-28 12:43:53 UTC (rev 4376) +++ branches/tora3/src/tools/toer.cpp 2012-06-28 15:35:28 UTC (rev 4377) @@ -228,6 +228,7 @@ } m_DotGraphView->graph()->updateWithGraph(m_Graph); m_DotGraphView->graph()->update(); + m_DotGraphView->prepareSelectSinlgeElement(); } void toERSchema::instanceChanged(int pos) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2012-07-27 14:50:54
|
Revision: 4384 http://tora.svn.sourceforge.net/tora/?rev=4384&view=rev Author: subik Date: 2012-07-27 14:50:47 +0000 (Fri, 27 Jul 2012) Log Message: ----------- compilation fixes on linux 64b Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/src/CMakeLists.txt branches/tora3/src/core/toresultdrawing.cpp branches/tora3/src/tools/toawr.h branches/tora3/src/tools/toer.cpp Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-07-26 21:14:12 UTC (rev 4383) +++ branches/tora3/CMakeLists.txt 2012-07-27 14:50:47 UTC (rev 4384) @@ -361,7 +361,6 @@ #Install our READMEs etc. INSTALL(FILES AUTHORS - BUGS ChangeLog COPYING INSTALL Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-07-26 21:14:12 UTC (rev 4383) +++ branches/tora3/src/CMakeLists.txt 2012-07-27 14:50:47 UTC (rev 4384) @@ -674,6 +674,8 @@ IF (MINGW) LIST(APPEND TORA_LIBS "-mwindows") ENDIF (MINGW) +ELSE (WIN32) + LIST(APPEND TORA_LIBS ${CMAKE_DL_LIBS}) ENDIF (WIN32) SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) Modified: branches/tora3/src/core/toresultdrawing.cpp =================================================================== --- branches/tora3/src/core/toresultdrawing.cpp 2012-07-26 21:14:12 UTC (rev 4383) +++ branches/tora3/src/core/toresultdrawing.cpp 2012-07-27 14:50:47 UTC (rev 4384) @@ -48,7 +48,11 @@ #include "icons/refresh.xpm" #include <QSlider> +#include <QVBoxLayout> +#include <QToolBar> +#include <QAction> + // BIG FAT WARNING - this query causes: ORA-07445: exception encountered: core dump [lnxmin()+2384] [SIGSEGV] // on 11gR1. Use "alter session set OPTIMIZER_FEATURES_ENABLE='10.2.0.4';" as a workaround // Note: the query is not bi-directional @@ -56,7 +60,7 @@ "toResultDrawing:FKConstraintsWithDistance", " SELECT /*+ optimizer_features_enable('10.2.0.4') */ R.* \n" " --, LEVEL as LVL \n" - " FROM ( \n" + " FROM ( \n" " SELECT \n" " c.constraint_name \n" // c1 " -- max(a.constraint_name) as constraint_name \n" Modified: branches/tora3/src/tools/toawr.h =================================================================== --- branches/tora3/src/tools/toawr.h 2012-07-26 21:14:12 UTC (rev 4383) +++ branches/tora3/src/tools/toawr.h 2012-07-27 14:50:47 UTC (rev 4384) @@ -53,7 +53,10 @@ class QTextBrowser; class QLineEdit; +class QTabWidget; +class QDateTimeEdit; + class toAWR : public toToolWidget { Q_OBJECT; Modified: branches/tora3/src/tools/toer.cpp =================================================================== --- branches/tora3/src/tools/toer.cpp 2012-07-26 21:14:12 UTC (rev 4383) +++ branches/tora3/src/tools/toer.cpp 2012-07-27 14:50:47 UTC (rev 4384) @@ -55,6 +55,9 @@ #include "dotgraph.h" #include "dotgraphview.h" +#include <QToolBar> + + static toSQL SQLALLRefs ( "toResultDrawing:ALLREFConstraints", " WITH REFS \n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2012-08-17 10:24:55
|
Revision: 4420 http://tora.svn.sourceforge.net/tora/?rev=4420&view=rev Author: subik Date: 2012-08-17 10:24:45 +0000 (Fri, 17 Aug 2012) Log Message: ----------- cmake: 'make docs' to create developer docs (html, Qt help) in build/tora-devel-docs Modified Paths: -------------- branches/tora3/CMakeLists.txt Added Paths: ----------- branches/tora3/doc/devel/Doxyfile.in branches/tora3/src/icons/tora.png Removed Paths: ------------- branches/tora3/doc/help/api/Doxyfile Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-08-17 09:36:26 UTC (rev 4419) +++ branches/tora3/CMakeLists.txt 2012-08-17 10:24:45 UTC (rev 4420) @@ -381,6 +381,29 @@ ENDIF (NOT WANT_BUNDLE) +find_package(Doxygen) +if(DOXYGEN_FOUND) + message(STATUS "") + message(STATUS "Developer documentation (doxygen) can be generated by 'make doc'") + message(STATUS "") + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/doc/devel/Doxyfile.in + ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY + ) + + add_custom_target(docs + ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Generating API documentation with Doxygen" VERBATIM + ) + +endif(DOXYGEN_FOUND) + + + + # packaging related stuff #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle") # SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) Added: branches/tora3/doc/devel/Doxyfile.in =================================================================== --- branches/tora3/doc/devel/Doxyfile.in (rev 0) +++ branches/tora3/doc/devel/Doxyfile.in 2012-08-17 10:24:45 UTC (rev 4420) @@ -0,0 +1,1679 @@ +# Doxyfile 1.7.3 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" "). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = TOra + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = @VERSION@ + +# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "developer documentation" + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = @CMAKE_SOURCE_DIR@/src/icons/tora.png + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@ + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = NO + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = YES + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@ + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = NO + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespaces are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = @CMAKE_SOURCE_DIR@ + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl + +FILE_PATTERNS = *.h *.cpp *.doxygen + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = @CMAKE_BINARY_DIR@ @CMAKE_SOURCE_DIR@/extlibs @CMAKE_SOURCE_DIR@/utils + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 3 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = tora-devel-docs + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = NO + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = YES + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = tora.qch + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = com.torasql.devel-docs + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> +# Qt Help Project / Custom Filters</a>. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> +# Qt Help Project / Filter Attributes</a>. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = qhelpgenerator + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [0,1..20]) +# that doxygen will group on one line in the generated HTML documentation. +# Note that a value of 0 will completely suppress the enum values from appearing in the overview section. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing +# MathJax, but it is strongly recommended to install a local copy of MathJax +# before deployment. + +MATHJAX_RELPATH = http://www.mathjax.org/mathjax + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = YES + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4 + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# ... [truncated message content] |
From: <ibr...@us...> - 2012-08-31 19:29:30
|
Revision: 4439 http://tora.svn.sourceforge.net/tora/?rev=4439&view=rev Author: ibre5041 Date: 2012-08-31 19:29:22 +0000 (Fri, 31 Aug 2012) Log Message: ----------- result plans simplified Modified Paths: -------------- branches/tora3/doc/devel/toresult.asta branches/tora3/src/connection/tooraclesetting.cpp branches/tora3/src/connection/tooraclesettingui.ui branches/tora3/src/core/toconfiguration.cpp branches/tora3/src/core/toconfiguration.h branches/tora3/src/core/toeventquery.cpp branches/tora3/src/core/tologger.h branches/tora3/src/core/toresultplan.cpp branches/tora3/src/core/toresultplan.h branches/tora3/src/tools/toanalyze.cpp branches/tora3/src/tools/tosgastatement.cpp branches/tora3/src/tools/toworksheet.cpp Modified: branches/tora3/doc/devel/toresult.asta =================================================================== (Binary files differ) Modified: branches/tora3/src/connection/tooraclesetting.cpp =================================================================== --- branches/tora3/src/connection/tooraclesetting.cpp 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/connection/tooraclesetting.cpp 2012-08-31 19:29:22 UTC (rev 4439) @@ -56,9 +56,9 @@ setupUi(this); DefaultDate->setText(toConfigurationSingle::Instance().dateFormat()); DefaultTimestamp->setText(toConfigurationSingle::Instance().timestampFormat()); - CheckPoint->setText(toConfigurationSingle::Instance().planCheckpoint()); + //CheckPoint->setText(toConfigurationSingle::Instance().planCheckpoint()); ExplainPlan->setText(toConfigurationSingle::Instance().planTable(NULL)); - OpenCursors->setValue(toConfigurationSingle::Instance().openCursors()); + //OpenCursors->setValue(toConfigurationSingle::Instance().openCursors()); KeepPlans->setChecked(toConfigurationSingle::Instance().keepPlans()); VsqlPlans->setChecked(toConfigurationSingle::Instance().vsqlPlans()); SharedPlan->setChecked(toConfigurationSingle::Instance().sharedPlan()); @@ -130,9 +130,9 @@ } } - toConfigurationSingle::Instance().setPlanCheckpoint(CheckPoint->text()); + //toConfigurationSingle::Instance().setPlanCheckpoint(CheckPoint->text()); toConfigurationSingle::Instance().setPlanTable(ExplainPlan->text()); - toConfigurationSingle::Instance().setOpenCursors(OpenCursors->value()); + //toConfigurationSingle::Instance().setOpenCursors(OpenCursors->value()); if (Unlimited->isChecked()) { toConfigurationSingle::Instance().setMaxLong(-1); Modified: branches/tora3/src/connection/tooraclesettingui.ui =================================================================== --- branches/tora3/src/connection/tooraclesettingui.ui 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/connection/tooraclesettingui.ui 2012-08-31 19:29:22 UTC (rev 4439) @@ -20,39 +20,7 @@ <property name="spacing"> <number>6</number> </property> - <item row="0" column="0"> - <widget class="QLabel" name="TextLabel6_2_3"> - <property name="toolTip"> - <string>The name of the checkpoint used when needed to rollback work.</string> - </property> - <property name="text"> - <string>&Checkpoint name</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - <property name="buddy"> - <cstring>CheckPoint</cstring> - </property> - </widget> - </item> <item row="1" column="0"> - <widget class="QLabel" name="TextLabel6_2_2_2"> - <property name="toolTip"> - <string>The default dateformat to use when querying the database.</string> - </property> - <property name="text"> - <string>&Default date format</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - <property name="buddy"> - <cstring>DefaultDate</cstring> - </property> - </widget> - </item> - <item row="2" column="0"> <widget class="QLabel" name="TextLabel6_2_2_3"> <property name="toolTip"> <string>The default timestamp format to use when querying the database.</string> @@ -69,15 +37,9 @@ </widget> </item> <item row="0" column="1" colspan="2"> - <widget class="QLineEdit" name="CheckPoint"/> - </item> - <item row="1" column="1" colspan="2"> <widget class="QLineEdit" name="DefaultDate"/> </item> - <item row="2" column="1" colspan="2"> - <widget class="QLineEdit" name="DefaultTimestamp"/> - </item> - <item row="4" column="0"> + <item row="2" column="0"> <widget class="QLabel" name="TextLabel6_3_2"> <property name="toolTip"> <string>Max length to read from LOB or LONG data fields. LONG:s can not be specified unlimited but will be defaulted to 33000 if unlimited.</string> @@ -93,112 +55,7 @@ </property> </widget> </item> - <item row="4" column="2"> - <widget class="QCheckBox" name="Unlimited"> - <property name="text"> - <string>Unlimited</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QLineEdit" name="MaxLong"> - <property name="enabled"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="6" column="1"> - <widget class="QPushButton" name="CreatePlanTable"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Create Table</string> - </property> - </widget> - </item> - <item row="6" column="2"> - <widget class="QCheckBox" name="VsqlPlans"> - <property name="toolTip"> - <string>Use V$SQL_PLAN when possible.</string> - </property> - <property name="text"> - <string>use &V$SQL_PLAN</string> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="TextLabel6_3"> - <property name="toolTip"> - <string>Name of the table to put explain plan output in.</string> - </property> - <property name="text"> - <string>&Explain plan table</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - <property name="buddy"> - <cstring>ExplainPlan</cstring> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="QLineEdit" name="ExplainPlan"/> - </item> - <item row="5" column="2"> - <widget class="QCheckBox" name="KeepPlans"> - <property name="toolTip"> - <string>Keep records for the plan explanations in the plan table.</string> - </property> - <property name="text"> - <string>&Keep plans</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="TextLabel1"> - <property name="text"> - <string>Maximum cursors to keep open</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - <property name="buddy"> - <cstring>OpenCursors</cstring> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QSpinBox" name="OpenCursors"> - <property name="minimum"> - <number>1</number> - </property> - </widget> - </item> - <item row="7" column="2"> - <widget class="QCheckBox" name="SharedPlan"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>shared PLAN_TABLE</string> - </property> - <property name="checked"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="8" column="0" colspan="2"> + <item row="6" column="0" colspan="2"> <widget class="QGroupBox" name="extractorGroupBox"> <property name="title"> <string>Extractor options</string> @@ -270,7 +127,36 @@ </layout> </widget> </item> - <item row="9" column="0"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel6_2_2_2"> + <property name="toolTip"> + <string>The default dateformat to use when querying the database.</string> + </property> + <property name="text"> + <string>&Default date format</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="buddy"> + <cstring>DefaultDate</cstring> + </property> + </widget> + </item> + <item row="5" column="2"> + <widget class="QCheckBox" name="SharedPlan"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>shared PLAN_TABLE</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="7" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -283,10 +169,84 @@ </property> </spacer> </item> + <item row="2" column="2"> + <widget class="QCheckBox" name="Unlimited"> + <property name="text"> + <string>Unlimited</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="TextLabel6_3"> + <property name="toolTip"> + <string>Name of the table to put explain plan output in.</string> + </property> + <property name="text"> + <string>&Explain plan table</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="buddy"> + <cstring>ExplainPlan</cstring> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLineEdit" name="ExplainPlan"/> + </item> + <item row="3" column="2"> + <widget class="QCheckBox" name="KeepPlans"> + <property name="toolTip"> + <string>Keep records for the plan explanations in the plan table.</string> + </property> + <property name="text"> + <string>&Keep plans</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="MaxLong"> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QPushButton" name="CreatePlanTable"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Create Table</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QCheckBox" name="VsqlPlans"> + <property name="toolTip"> + <string>Use V$SQL_PLAN when possible.</string> + </property> + <property name="text"> + <string>use &V$SQL_PLAN</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="DefaultTimestamp"/> + </item> </layout> </widget> <tabstops> - <tabstop>CheckPoint</tabstop> <tabstop>DefaultDate</tabstop> <tabstop>DefaultTimestamp</tabstop> <tabstop>MaxLong</tabstop> Modified: branches/tora3/src/core/toconfiguration.cpp =================================================================== --- branches/tora3/src/core/toconfiguration.cpp 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/core/toconfiguration.cpp 2012-08-31 19:29:22 UTC (rev 4439) @@ -1119,15 +1119,6 @@ p->m_planTable = v; } -QString toConfiguration::planCheckpoint() -{ - return p->m_planCheckpoint; -} -void toConfiguration::setPlanCheckpoint(const QString & v) -{ - p->m_planCheckpoint = v; -} - QString toConfiguration::textFont() { return p->m_textFont; @@ -1711,14 +1702,14 @@ } // tooracleconnection -int toConfiguration::openCursors() -{ - return p->m_openCursors; -} -void toConfiguration::setOpenCursors(int v) -{ - p->m_openCursors = v; -} +//int toConfiguration::openCursors() +//{ +// return p->m_openCursors; +//} +//void toConfiguration::setOpenCursors(int v) +//{ +// p->m_openCursors = v; +//} int toConfiguration::maxLong() { Modified: branches/tora3/src/core/toconfiguration.h =================================================================== --- branches/tora3/src/core/toconfiguration.h 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/core/toconfiguration.h 2012-08-31 19:29:22 UTC (rev 4439) @@ -96,12 +96,6 @@ int maxColDisp(); void setMaxColDisp(int v); - QString planTable(QString schema); - void setPlanTable(const QString & v); - - QString planCheckpoint(); - void setPlanCheckpoint(const QString & v); - QString textFont(); void setTextFont(const QString & v); @@ -111,12 +105,6 @@ QString listFont(); void setListFont(const QString & v); - QString dateFormat(); - void setDateFormat(const QString & v); - - QString timestampFormat(); - void setTimestampFormat(const QString & v); - QString refresh(); void setRefresh(const QString & v); @@ -218,15 +206,6 @@ int maxContent(); void setMaxContent(int v); - bool keepPlans(); - void setKeepPlans(bool v); - - bool vsqlPlans(); - void setVsqlPlans(bool v); - - bool sharedPlan(); - void setSharedPlan(bool v); - bool restoreSession(); void setRestoreSession(bool v); @@ -292,12 +271,27 @@ void setStyle(const QString & v); // tooracleconnection - int openCursors(); - void setOpenCursors(int v); + QString dateFormat(); + void setDateFormat(const QString & v); + QString timestampFormat(); + void setTimestampFormat(const QString & v); + int maxLong(); void setMaxLong(int v); + QString planTable(QString schema); + void setPlanTable(const QString & v); + + bool keepPlans(); + void setKeepPlans(bool v); + + bool vsqlPlans(); + void setVsqlPlans(bool v); + + bool sharedPlan(); + void setSharedPlan(bool v); + // toqsqlconnection bool onlyForward(); void setOnlyForward(bool v); Modified: branches/tora3/src/core/toeventquery.cpp =================================================================== --- branches/tora3/src/core/toeventquery.cpp 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/core/toeventquery.cpp 2012-08-31 19:29:22 UTC (rev 4439) @@ -59,7 +59,7 @@ : QObject(parent) , SQL(sql) , Param(param) - , ColumnCount(0) + , ColumnCount(0) , Processed(0L) //, Statistics(stats) , Thread(NULL) @@ -70,23 +70,26 @@ , CancelCondition(new toEventQuery::WaitConditionWithMutex()) , Mode(mode) { - /* BIG FAT WARNING QThread's parent must be NULL, so it is not disposed when toEventQueryNew is deleted. - * Theoretically (and practically) it can be freed after ~toEventQueryNew is processed + /* BIG FAT WARNING QThread's parent must be NULL, so it is not disposed when toEventQuery is deleted. + * Theoretically (and practically) it can be freed after ~toEventQuery is processed */ Thread = new BGThread(NULL); Thread->setObjectName("toEventQuery"); - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew created" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery created" << std::endl; } toEventQuery::~toEventQuery() { - TLOG(7, toDecorator, __HERE__) << "~toEventQueryNew a" << std::endl; + TLOG(7, toDecorator, __HERE__) << "~toEventQuery a" << std::endl; // we request bg thread to stop, but do not really wait for thread finish stop(); } void toEventQuery::start() { + if( Worker || Started || WorkDone ) + throw tr("toEventQuery::start - can not restart already stared query"); + Worker = new toEventQueryWorker(this, Connection, CancelCondition, SQL, Param); Worker->moveToThread(Thread); Thread->Slave = Worker; @@ -125,7 +128,7 @@ connect(Thread, SIGNAL(destroyed()), this, SLOT(slotThreadEnd())); // main -> main connect(this, SIGNAL(stopRequested()), Worker, SLOT(slotStop())); // main -> BG - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew start" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery start" << std::endl; // finally start the thread Thread->start(); } @@ -157,7 +160,7 @@ * the rest is processed in the main thread * the slot taskData receives data (runs within the main thread context) * taskData emits signal dataAvailable - * toEventQueryNew parent(toResulModel for example) receives signal + * toEventQuery parent(toResulModel for example) receives signal * and then calls toEventQeury::readValue */ toQValue toEventQuery::readValue() @@ -190,20 +193,20 @@ void toEventQuery::stop(void) { - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew stop a" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery stop a" << std::endl; if(WorkDone) return; if(Thread && Thread->isRunning()) { - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew stop Thread is running" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery stop Thread is running" << std::endl; CancelCondition->Mutex.lock(); emit stopRequested(); bool succeeded = CancelCondition->WaitCondition.wait(&CancelCondition->Mutex, 1000); // possible wait for 1 sec CancelCondition->Mutex.unlock(); if(!succeeded) { - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew stop bg did not respond" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery stop bg did not respond" << std::endl; if(Connection->ParentConnection.getTraits().hasAsyncBreak()) try { (*Connection)->cancel(); @@ -224,7 +227,7 @@ void toEventQuery::slotData(ValuesList &values) { - //TLOG(7, toDecorator, __HERE__) << "toEventQueryNew slot data" << std::endl; + //TLOG(7, toDecorator, __HERE__) << "toEventQuery slot data" << std::endl; Values += values; emit dataAvailable(this); if(Mode == READ_ALL) @@ -244,7 +247,7 @@ void toEventQuery::slotDesc(toQColumnDescriptionList &desc, int column) { - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew slot desc" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery slot desc" << std::endl; Started = true; Description = desc; ColumnCount = column; @@ -253,13 +256,13 @@ void toEventQuery::slotError(const toConnection::exception &msg) { - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew slot error" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery slot error" << std::endl; emit error(this, msg); } void toEventQuery::slotFinished() { - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew slot finish" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery slot finish" << std::endl; WorkDone = true; disconnect(SIGNAL(consumed())); disconnect(SIGNAL(dataRequested())); @@ -268,13 +271,13 @@ void toEventQuery::slotRowsProcessed(unsigned long rows) { - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew slot rows" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery slot rows" << std::endl; Processed = rows; } void toEventQuery::slotThreadEnd() { - TLOG(7, toDecorator, __HERE__) << "toEventQueryNew thread end" << std::endl; + TLOG(7, toDecorator, __HERE__) << "toEventQuery thread end" << std::endl; Thread = NULL; Worker = NULL; } Modified: branches/tora3/src/core/tologger.h =================================================================== --- branches/tora3/src/core/tologger.h 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/core/tologger.h 2012-08-31 19:29:22 UTC (rev 4439) @@ -129,7 +129,7 @@ DISABLE_LOG(4); // data read(disabled) DOCKLET_LOG(5); // connection provider finder DISABLE_LOG(6); // -//DISABLE_LOG(7); // +DOCKLET_LOG(7); // DISABLE_LOG(8); // DISABLE_LOG(9); // @@ -158,7 +158,7 @@ case 4: return templ_get_log_ownthread< 4>(NULL); // data read log case 5: return templ_get_log_ownthread< 5>(NULL); // logger docket log case 6: return templ_get_log_ownthread< 6>(NULL); // not used yet - case 7: return templ_get_log_ownthread< 7>(NULL); // toEventQueryNew + case 7: return templ_get_log_ownthread< 7>(NULL); // toEventQuery case 8: return templ_get_log_ownthread< 8>(NULL); // not used yet case 9: return templ_get_log_ownthread< 9>(NULL); // not used yet default: Modified: branches/tora3/src/core/toresultplan.cpp =================================================================== --- branches/tora3/src/core/toresultplan.cpp 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/core/toresultplan.cpp 2012-08-31 19:29:22 UTC (rev 4439) @@ -59,10 +59,10 @@ toResultPlan::toResultPlan(QWidget *parent, const char *name) : toResultView(false, false, parent, name) + , Explaining(false) { setSQLName(QString::fromLatin1("toResultPlan")); setAlternatingRowColors(true); - Query = NULL; oracleSetup(); } @@ -131,11 +131,6 @@ conn.providerIs("PostgreSQL"); } -toResultPlan::~toResultPlan() -{ - delete Query; -} - void toResultPlan::oracleSetup(void) { clear(); @@ -168,85 +163,82 @@ { connect(Query, SIGNAL(dataAvailable(toEventQuery*)), this, SLOT(slotPoll())); connect(Query, SIGNAL(done(toEventQuery*)), this, SLOT(slotQueryDone())); + connect(Query, SIGNAL(error(toEventQuery*,toConnection::exception const &)), this, SLOT(slotErrorHanler(toEventQuery*, toConnection::exception const &))); Query->start(); -} // connectSlotsAndStart +} -void toResultPlan::oracleNext(void) -{ - LastTop = NULL; - Parents.clear(); - Last.clear(); +//void toResultPlan::oracleNext() +//{ +// LastTop = NULL; +// Parents.clear(); +// Last.clear(); +// +// toConnection &conn = connection(); +// //toConnectionSubLoan connSub(conn); +// +// //connSub->execute(QString::fromLatin1("SAVEPOINT %1").arg(chkPoint)); +// +// Ident = QString::fromLatin1("TOra ") + QString::number((int)time(NULL) + rand()); +// +// QString planTable(toConfigurationSingle::Instance().planTable(conn.user())); +// +// QString sql = Utils::toShift(Statements); +// if (sql.isNull()) +// { +// return ; +// } +// if (sql.length() > 0 && sql.at(sql.length() - 1).toLatin1() == ';') +// sql = sql.mid(0, sql.length() - 1); +// +// QString explain = QString::fromLatin1("EXPLAIN PLAN SET STATEMENT_ID = '%1' INTO %2 FOR %3"). +// arg(Ident).arg(planTable).arg(Utils::toSQLStripSpecifier(sql)); +// +// if (!Schema.isNull() && Schema != conn.user().toUpper()) +// { +// //try +// //{ +// // connSub->execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = \"%1\"").arg(User)); +// // connSub->execute(explain); +// //} +// //catch (...) +// //{ +// // try +// // { +// // // conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %1").arg(connection().user())); +// // // when we start connection it is for user but in schema context +// // connSub->execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = \"%1\"").arg(connection().schema())); +// // } +// // catch (...) +// // { +// // TLOG(1, toDecorator, __HERE__) << " Ignored exception." << std::endl; +// // } +// // throw; +// //} +// ////conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %1").arg(connection().user())); +// //when we start connection it is for user but in schema context +// //connSub->execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = \"%1\"").arg(connection().schema())); +// Query = new toEventQuery(this +// , conn +// , toSQL::string(SQLViewPlan, conn). +// // arg(toConfigurationSingle::Instance().planTable()). +// // Since EXPLAIN PLAN is always to conn.user() plan_table +// arg(explain).arg(Ident) +// , toQueryParams() +// , toEventQuery::READ_ALL +// ); +// connectSlotsAndStart(); +// Explaining = false; +// } +// else +// { +// Explaining = true; +// Query = new toEventQuery(this, conn, explain, toQueryParams(), toEventQuery::READ_ALL); +// connectSlotsAndStart(); +// } +// TopItem = new toResultViewItem(this, TopItem, QString::fromLatin1("EXPLAIN PLAN:")); +// TopItem->setText(1, sql.left(50).trimmed()); +//} - QString chkPoint(toConfigurationSingle::Instance().planCheckpoint()); - - toConnection &conn = connection(); - //toConnectionSubLoan connSub(conn); - - //connSub->execute(QString::fromLatin1("SAVEPOINT %1").arg(chkPoint)); - - Ident = QString::fromLatin1("TOra ") + QString::number((int)time(NULL) + rand()); - - QString planTable(toConfigurationSingle::Instance().planTable(conn.user())); - - QString sql = Utils::toShift(Statements); - if (sql.isNull()) - { - return ; - } - if (sql.length() > 0 && sql.at(sql.length() - 1).toLatin1() == ';') - sql = sql.mid(0, sql.length() - 1); - - QString explain = QString::fromLatin1("EXPLAIN PLAN SET STATEMENT_ID = '%1' INTO %2 FOR %3"). - arg(Ident).arg(planTable).arg(Utils::toSQLStripSpecifier(sql)); - - if (!User.isNull() && User != conn.user().toUpper()) - { - //try - //{ - // connSub->execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = \"%1\"").arg(User)); - // connSub->execute(explain); - //} - //catch (...) - //{ - // try - // { - // // conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %1").arg(connection().user())); - // // when we start connection it is for user but in schema context - // connSub->execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = \"%1\"").arg(connection().schema())); - // } - // catch (...) - // { - // TLOG(1, toDecorator, __HERE__) << " Ignored exception." << std::endl; - // } - // throw; - //} - ////conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %1").arg(connection().user())); - //when we start connection it is for user but in schema context - //connSub->execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = \"%1\"").arg(connection().schema())); - toQueryParams par; - Query = new toEventQuery(this - , conn - , toSQL::string(SQLViewPlan, conn). - // arg(toConfigurationSingle::Instance().planTable()). - // Since EXPLAIN PLAN is always to conn.user() plan_table - arg(explain).arg(Ident) - , par - , toEventQuery::READ_ALL - ); - connectSlotsAndStart(); - Reading = true; - } - else - { - Reading = false; - toQueryParams par; - Query = new toEventQuery(this, conn, explain, par, toEventQuery::READ_ALL); - connectSlotsAndStart(); - } - TopItem = new toResultViewItem(this, TopItem, QString::fromLatin1("EXPLAIN PLAN:")); - TopItem->setText(1, sql.left(50).trimmed()); -} - static void StripInto(std::list<toSQLParse::statement> &stats) { std::list<toSQLParse::statement> res; @@ -300,8 +292,7 @@ } } -void toResultPlan::query(const QString &sql, - toQueryParams const& param) +void toResultPlan::query(const QString &sql, toQueryParams const& param) { if (!handled()) return ; @@ -311,58 +302,47 @@ if (!setSqlAndParams(sql, param)) return ; - if (Query) + toConnection &conn = connection(); + if (conn.provider() == "MySQL" || conn.provider() == "PostgreSQL") { - delete Query; - Query = NULL; - } - if (connection().provider() == "MySQL" || connection().provider() == "PostgreSQL") - { setRootIsDecorated(false); setSorting(0); toResultView::query(QString::fromLatin1("EXPLAIN ") + Utils::toSQLStripBind(sql), param); return ; } - toQueryParams::const_iterator cp = param.begin(); - if (cp != param.end()) - User = *cp; - else - User = QString::null; - clear(); - QString planTable(toConfigurationSingle::Instance().planTable(connection().user())); + Statements.clear(); + LastTop = NULL; + Parents.clear(); + Parents.clear(); + Last.clear(); - Statements.clear(); + // Display already saved plan if (sql.startsWith(QString::fromLatin1("SAVED:"))) { + Explaining = false; Ident = sql.mid(6); - toQueryParams par; + TopItem = new toResultViewItem(this, NULL, QString::fromLatin1("DML")); + TopItem->setText(1, QString::fromLatin1("Saved plan")); + QString planTable(toConfigurationSingle::Instance().planTable(connection().user())); Query = new toEventQuery(this - , connection() - // NOTE: this is special case - plan table is defined as %1. table name can not use bind variable place holder + , connection() + // NOTE: this is special case - plan table is defined as %1. table name can not use bind variable place holder , toSQL::string(SQLViewPlan, connection()).arg(planTable).arg(Ident) - , par - , toEventQuery::READ_ALL); + , toQueryParams() + , toEventQuery::READ_ALL); connectSlotsAndStart(); - Reading = true; - LastTop = NULL; - Parents.clear(); - Last.clear(); - TopItem = new toResultViewItem(this, NULL, QString::fromLatin1("DML")); - TopItem->setText(1, QString::fromLatin1("Saved plan")); + } + // Display plan held in SGA - the plan will be diplayed when slotChildComboReady is called else if (sql.startsWith(QString::fromLatin1("SGA:"))) { + Explaining = false; Ident = sql.mid(4); - toConnection &conn = connection(); - - LastTop = NULL; - Parents.clear(); - Last.clear(); + QString queryText = Utils::toSQLString(conn, Ident); TopItem = new toResultViewItem(this, NULL, QString::fromLatin1("V$SQL_PLAN:")); - QString queryText = Utils::toSQLString(conn, Ident); TopItem->setText(1, queryText.left(50).trimmed()); TopItem->setToolTip(1, queryText); @@ -372,18 +352,38 @@ try { CursorChildSel->refreshWithParams(toQueryParams() << Ident); - // CursorChildSel->refresh(); } TOCATCH; setItemWidget(TopItem, 3, CursorChildSel); connect(CursorChildSel, SIGNAL(done()), this, SLOT(slotChildComboReady())); //Wait for cursor children combo to fill } + // Execute EXPLAIN PLAN FOR ... else { - TopItem = NULL; + Explaining = true; + Ident = QString::fromLatin1("TOra ") + QString::number((int)time(NULL) + rand()); + TopItem = new toResultViewItem(this, NULL, QString::fromLatin1("EXPLAIN PLAN:")); + TopItem->setText(1, sql.left(50).trimmed()); + std::list<toSQLParse::statement> ret = toSQLParse::parse(sql); addStatements(ret); - oracleNext(); + QString sql = Utils::toShift(Statements); + if (sql.isEmpty()) + { + return ; + } + if(sql.endsWith(';')) + sql.truncate(sql.length() - 1); + + QString planTable(toConfigurationSingle::Instance().planTable(conn.user())); + + QString explain = QString::fromLatin1("EXPLAIN PLAN SET STATEMENT_ID = '%1' INTO %2 FOR %3"). + arg(Ident). + arg(planTable). + arg(Utils::toSQLStripSpecifier(sql)); + + Query = new toEventQuery(this, conn, explain, toQueryParams(), toEventQuery::READ_ALL); + connectSlotsAndStart(); } } catch (const QString &str) @@ -487,7 +487,6 @@ } catch (const QString &str) { - delete Query; Query = NULL; checkException(str); } @@ -495,6 +494,7 @@ void toResultPlan::slotChildComboReady() { + Explaining = false; if(CursorChildSel->currentIndex () == -1) return; toConnection &conn = connection(); @@ -510,11 +510,11 @@ , toQueryParams() << Ident << ChildNumber , toEventQuery::READ_ALL); connectSlotsAndStart(); - Reading = true; } void toResultPlan::slotChildComboChanged(int NewIndex) { + Explaining = false; if (NewIndex > -1 ) { toConnection &conn = connection(); @@ -531,36 +531,42 @@ LastTop = NULL; Parents.clear(); Last.clear(); + Query = new toEventQuery(this , conn , toSQL::string(SQLViewVSQLPlan, connection()) , toQueryParams() << Ident << ChildNumber , toEventQuery::READ_ALL); connectSlotsAndStart(); - Reading = true; } } - +/** this ugly function handles various query ends: + * - v$sql_plan child combo query + * - v$sql_plan query + * - EXLPLAIN PLAN FOR ... query + * - SELECT ... FROM PLAN_TABLE QUERY + */ void toResultPlan::slotQueryDone() { - delete Query; Query = NULL; - if (!Reading) + if (Explaining) { + Explaining = false; toQueryParams par; - toConnectionSubLoan connSub(connection()); + toConnection &conn(connection()); - throw toConnection::exception("Not implemented yet toResultPlan::queryDone"); - //Query = new toEventQuery(connSub, toQuery::Normal, - // toSQL::string(SQLViewPlan, connSub). - // // arg(toConfigurationSingle::Instance().planTable()). - // // Since EXPLAIN PLAN is always to conn.user() plan_table - // // and current_schema can be different - // arg(toConfigurationSingle::Instance().planTable(conn.user())). - // arg(Ident), par); + Query = new toEventQuery(this + , connection() + , toSQL::string(SQLViewPlan, conn). + // arg(toConfigurationSingle::Instance().planTable()). + // Since EXPLAIN PLAN is always to conn.user() plan_table + // and current_schema can be different + arg(toConfigurationSingle::Instance().planTable(conn.user())). + arg(Ident) + , toQueryParams() + , toEventQuery::READ_ALL); connectSlotsAndStart(); - Reading = true; } else if (sql().startsWith(QString::fromLatin1("SGA:"))) { @@ -568,24 +574,28 @@ } else { - QString chkPoint(toConfigurationSingle::Instance().planCheckpoint()); - if (!sql().startsWith(QString::fromLatin1("SAVED:"))) - { - throw toConnection::exception("Not implemented yet toResultPlan::queryDone"); - //if (toConfigurationSingle::Instance().keepPlans()) - // connection().execute(QString::fromLatin1("ROLLBACK TO SAVEPOINT %1").arg(chkPoint)); - //else - // toMainWidget()->setNeedCommit(connection()); - } - oracleNext(); + //if (!sql().startsWith(QString::fromLatin1("SAVED:"))) + //{ + // Utils::toStatusMessage("Not implemented yet toResultPlan::queryDone"); + // //if (toConfigurationSingle::Instance().keepPlans()) + // // connection().execute(QString::fromLatin1("ROLLBACK TO SAVEPOINT %1").arg(chkPoint)); + // //else + // // toMainWidget()->setNeedCommit(connection()); + //} + //oracleNext(); } } // queryDone +void toResultPlan::slotErrorHanler(toEventQuery*, toConnection::exception const &e) +{ + checkException(e); +} + void toResultPlan::checkException(const QString &str) { try { - if (str.startsWith(QString::fromLatin1("ORA-02404"))) + if (str.contains(QString::fromLatin1("ORA-02404"))) { QString planTable(toConfigurationSingle::Instance().planTable(connection().user())); @@ -606,7 +616,7 @@ tr("&Yes"), tr("&No"), QString::null, 0, 1); if (ret == 0) { - throw toConnection::exception("Not implemented yet toResultPlan::checkException"); + Utils::toStatusMessage("Not implemented yet toResultPlan::checkException"); //connection().execute(toSQL::string(toSQL::TOSQL_CREATEPLAN, // connection()).arg(planTable)); //QString t = sql(); Modified: branches/tora3/src/core/toresultplan.h =================================================================== --- branches/tora3/src/core/toresultplan.h 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/core/toresultplan.h 2012-08-31 19:29:22 UTC (rev 4439) @@ -60,24 +60,8 @@ class toResultPlan : public toResultView { - Q_OBJECT + Q_OBJECT; - QString Ident; - std::map <QString, toTreeWidgetItem *> Parents; - std::map <QString, toTreeWidgetItem *> Last; - std::list<QString> Statements; - toTreeWidgetItem *TopItem; - toTreeWidgetItem *LastTop; - bool Reading; // true when reading the plan, false when setting up the plan - toEventQuery *Query; - QString User; - toResultCombo *CursorChildSel; //Used for Oracle for V$SQL_PLAN to choose plans among cursor children - void checkException(const QString &); - void oracleSetup(void); - - void oracleNext(void); - void addStatements(std::list<toSQLParse::statement> &stats); - void connectSlotsAndStart(); public: /** Create the widget. * @param parent Parent widget. @@ -87,28 +71,42 @@ /** Destruct object */ - ~toResultPlan(); + ~toResultPlan() {}; /** Reimplemented for internal reasons. If you prepend "SAVED:" a saved plan is read * with the identified_by set to the string following the initial "SAVED:" string. * If you prepend SGA: the rest is interpreted as cursor address:hash_value in V$SQL_PLAN. */ virtual void query(const QString &sql, toQueryParams const& param); - /** Reimplemented for internal reasons. - */ - void query(const QString &sql) - { - toQueryParams p; - query(sql, p); - } + /** Support Oracle */ virtual bool canHandle(toConnection &conn); + +private: + QString Ident; + std::map <QString, toTreeWidgetItem *> Parents; + std::map <QString, toTreeWidgetItem *> Last; + std::list<QString> Statements; + toTreeWidgetItem *TopItem; + toTreeWidgetItem *LastTop; + bool Explaining; // true when explaining the query, false when fetching the plan + QPointer<toEventQuery> Query; + QString Schema; + toResultCombo *CursorChildSel; //Used for Oracle for V$SQL_PLAN to choose plans among cursor children + void checkException(const QString &); + void oracleSetup(void); + + //void oracleNext(); + void addStatements(std::list<toSQLParse::statement> &stats); + void connectSlotsAndStart(); + private slots: void slotPoll(); void slotQueryDone(); void slotChildComboReady(); void slotChildComboChanged(int NewIndex); + void slotErrorHanler(toEventQuery*, toConnection::exception const &); }; #endif Modified: branches/tora3/src/tools/toanalyze.cpp =================================================================== --- branches/tora3/src/tools/toanalyze.cpp 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/tools/toanalyze.cpp 2012-08-31 19:29:22 UTC (rev 4439) @@ -705,7 +705,7 @@ { QModelIndex index = Plans->selectedIndex(); if (index.isValid()) - CurrentPlan->query("SAVED:" + index.data(Qt::EditRole).toString()); + CurrentPlan->query("SAVED:" + index.data(Qt::EditRole).toString(), toQueryParams()); } void toAnalyze::slotFillOwner(void) Modified: branches/tora3/src/tools/tosgastatement.cpp =================================================================== --- branches/tora3/src/tools/tosgastatement.cpp 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/tools/tosgastatement.cpp 2012-08-31 19:29:22 UTC (rev 4439) @@ -149,7 +149,7 @@ toQuery::readQuery(conn, toSQL::string(SQLcheckVSQL, conn).arg(Address), toQueryParams()).begin()->toInt() > 0 ) { - Plan->query(QString::fromLatin1("SGA:") + Address); + Plan->query(QString::fromLatin1("SGA:") + Address, toQueryParams()); } else { toQueryParams params; toQList l; Modified: branches/tora3/src/tools/toworksheet.cpp =================================================================== --- branches/tora3/src/tools/toworksheet.cpp 2012-08-30 20:24:20 UTC (rev 4438) +++ branches/tora3/src/tools/toworksheet.cpp 2012-08-31 19:29:22 UTC (rev 4439) @@ -854,7 +854,7 @@ if (QueryString.length()) { if (CurrentTab == Plan) - Plan->query(QueryString); + Plan->query(QueryString, toQueryParams()); else if (CurrentTab == ResourceSplitter) viewResources(); else if (CurrentTab == Statistics && Result->running()) @@ -1073,7 +1073,7 @@ if (type == OnlyPlan) { ResultTab->setCurrentIndex(ResultTab->indexOf(Plan)); - Plan->query(str); + Plan->query(str, toQueryParams()); slotUnhideResults(); } else if (!describe(QueryString)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2012-09-10 07:32:59
|
Revision: 4457 http://tora.svn.sourceforge.net/tora/?rev=4457&view=rev Author: subik Date: 2012-09-10 07:32:51 +0000 (Mon, 10 Sep 2012) Log Message: ----------- cmake simplification - 1st part Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/README.CMAKE branches/tora3/README.OSX branches/tora3/extlibs/CMakeLists.txt branches/tora3/src/CMakeLists.txt Removed Paths: ------------- branches/tora3/cmake/modules/ToraCompat.cmake branches/tora3/doc/CMakeLists.txt branches/tora3/doc/help/CMakeLists.txt branches/tora3/doc/help/images/CMakeLists.txt Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/CMakeLists.txt 2012-09-10 07:32:51 UTC (rev 4457) @@ -2,62 +2,35 @@ ########## CMake Setup ########## # options available for user's input -OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF) OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF) OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON) OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON) OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON) OPTION(ENABLE_TERADATA "Enable/Disable Teradata support." ON) -OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON) -OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF) -OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON) -OPTION(WANT_UNIVERSAL "Build mac binary for 32 and 64 bit together" ON) +OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" OFF) OPTION(USE_PCH "Use percompiled headers" ON) -OPTION(USE_EXPERIMENTAL "Use experimental code" OFF) +OPTION(USE_EXPERIMENTAL "Use experimental code" ON) #Set our CMake minimum version #Require 2.4.2 for Qt finding #Require 2.4.3 for moc change detection and rpath updates for custom cairo install #Require 2.8 for svnversion CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) -# FIXME: dont't forget to change CMP0005 policy to NEW after 2.6.0 minimum required! -# handle new cmake versions correctly -if(COMMAND cmake_policy) - if (POLICY CMP0003) - cmake_policy(SET CMP0003 NEW) - endif (POLICY CMP0003) - if (POLICY CMP0005) - cmake_policy(SET CMP0005 NEW) # FIXME change it to new when there will be cmake 2.6.x in most distros - endif (POLICY CMP0005) - if (POLICY CMP0011) - cmake_policy(SET CMP0011 NEW) - endif (POLICY CMP0011) - if (POLICY CMP0015) - cmake_policy(SET CMP0015 NEW) - endif (POLICY CMP0015) -endif(COMMAND cmake_policy) - #Pretty colors SET(CMAKE_COLOR_MAKEFILE ON) #Dont force verbose -SET(CMAKE_VERBOSE_MAKEFILE ON) +SET(CMAKE_VERBOSE_MAKEFILE OFF) #Include current dir SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) -INCLUDE(CheckIncludeFile) -INCLUDE(CheckCCompilerFlag) -INCLUDE(CheckCXXCompilerFlag) -INCLUDE(CheckTypeSize) -INCLUDE(TestBigEndian) -INCLUDE(FindSubversion) - #Set the custom CMake module directory where our include/lib finders are SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") -# Check for SVN + +# Check for SVN to include SVn revision in SVN based builds FIND_PACKAGE(Subversion) IF (Subversion_FOUND) # a custom target that is always built @@ -69,11 +42,10 @@ ADD_DEFINITIONS("-DHAVE_SVNREVISION_H=1") ENDIF(Subversion_FOUND) + #Project Setup PROJECT(TOra) #Set our version values -#Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX} -#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level) SET (VERSION_MAJOR "3") SET (VERSION_MINOR "0") SET (VERSION_PATCH "0") @@ -83,9 +55,9 @@ FILE(WRITE ${CMAKE_BINARY_DIR}/toversion.h "#define TOVERSION \"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}\"\n") SET (EXE_NAME "tora") -if (WANT_BUNDLE) +if (APPLE) SET(EXE_NAME "TOra") -endif(WANT_BUNDLE) +endif(APPLE) # Ok, it has to be called after project is set. The we are sure we have size of void pointer set correctly... INCLUDE(LibSuffix) @@ -93,83 +65,45 @@ #Set the permissions to be used when installing plugins SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE) -if (NOT TORA_DOC_DIR) - IF (UNIX) - SET (TORA_DOC_DIR "share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") - ELSE (UNIX) - SET (TORA_DOC_DIR "doc/") - ENDIF (UNIX) -endif (NOT TORA_DOC_DIR) -#if (NOT TORA_HELP_DIR) -# SET (TORA_HELP_DIR "${TORA_PLUGIN_DIR}/help/") -#endif (NOT TORA_HELP_DIR) -#ADD_DEFINITIONS("-DTORA_HELP_DIR=\\\"${TORA_HELP_DIR}\\\"") - ############################################################################################################## ########## check for the CPU we build for ########## IF (CMAKE_COMPILER_IS_GNUCC) - EXECUTE_PROCESS( - COMMAND ${CMAKE_C_COMPILER} -dumpmachine - OUTPUT_VARIABLE MACHINE - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - MESSAGE(STATUS "Building for target ${MACHINE}") - - STRING(REGEX MATCH "(i?86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}") - IF (_machine_x86) - MESSAGE(STATUS "Found target X86") - SET(ARCH_X86 1) - ENDIF (_machine_x86) - - STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}") - IF (_machine_x86_64) - MESSAGE(STATUS "Found target X86_64") - SET(ARCH_X86_64 1) - ENDIF (_machine_x86_64) - - STRING(REGEX MATCH "(ppc-*)" _machine_ppc "${MACHINE}") - IF (_machine_ppc) - MESSAGE(STATUS "Found target PPC") - SET(ARCH_PPC 1) - ENDIF (_machine_ppc) - SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -ggdb3") SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -ggdb3") - IF (WANT_UNIVERSAL) - #SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -arch i386 -arch x86_64") - #SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -arch i386 -arch x86_64") - #SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -arch i386 -arch x86_64") - #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -arch i386 -arch x86_64") - SET (CMAKE_OSX_ARCHITECTURES "i386;x86_64;") - ENDIF (WANT_UNIVERSAL) - ENDIF (CMAKE_COMPILER_IS_GNUCC) #Convert our simpler command line option to the CMake style #None, Debug, Release, .. or custom ones -IF(WANT_DEBUG) - SET(CMAKE_BUILD_TYPE Debug) - ADD_DEFINITIONS("-DDEBUG") - - # Boost headers are required to compile with -DDEBUG (see tologger.h) - FIND_PACKAGE(Boost REQUIRED) - IF (Boost_FOUND) - MESSAGE(STATUS "Found Boost libraries for debug build") - INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) - else (Boost_FOUND) - MESSAGE(FATAL "Boost libs not found. It's mandatory to build with debugging") - ENDIF (Boost_FOUND) -ELSE(WANT_DEBUG) - SET(CMAKE_BUILD_TYPE RELEASE) -ENDIF(WANT_DEBUG) +if (CMAKE_BUILD_TYPE MATCHES [Dd]ebug) + message(STATUS "Debug build") + set(CMAKE_BUILD_TYPE Debug) + add_definitions(-DDEBUG) + set(TORA_DEBUG 1) + + if (0) + # Boost headers are required to compile with -DDEBUG (see tologger.h) + FIND_PACKAGE(Boost REQUIRED) + IF (Boost_FOUND) + MESSAGE(STATUS "Found Boost libraries for debug build: ${Boost_INCLUDE_DIRS}") + else (Boost_FOUND) + MESSAGE(FATAL "Boost libs not found. It's mandatory to build with debugging") + ENDIF (Boost_FOUND) + endif() +else() + message(STATUS "non-debug build") + set(TORA_DEBUG 0) + add_definitions(-DNDEBUG) + add_definitions(-DQT_NO_DEBUG_OUTPUT) +endif() + # Lets disable Wall warnings due the MSVC too much talkative # output. Wall can slow down compiletion up to hours and # my boxes can boil eggs too. @@ -299,41 +233,7 @@ FIND_PACKAGE(GraphViz) ENDIF(USE_EXPERIMENTAL) -############################################################################################################## -########## Include Setup ########## -TEST_BIG_ENDIAN(WORDS_BIGENDIAN) - -CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) -IF(HAVE_DLFCN_H) - ADD_DEFINITIONS(-DHAVE_DLFCN_H) -ENDIF(HAVE_DLFCN_H) - -CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) -IF(HAVE_UNISTD_H) - ADD_DEFINITIONS(-DHAVE_UNISTD_H) -ENDIF(HAVE_UNISTD_H) - -CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) -# IF(HAVE_SYS_TYPES_H) -# ADD_DEFINITIONS(-DHAVE_SYS_TYPES_H) -# ENDIF(HAVE_SYS_TYPES_H) - -CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) -# IF(HAVE_SYS_STAT_H) -# ADD_DEFINITIONS(-DHAVE_SYS_STAT_H) -# ENDIF(HAVE_SYS_STAT_H) -#>>Test for existing include files - - -#Create configure files.. config.h and uninstall -#config.h -# INCLUDE (ConfigureChecks.cmake) -##CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -##ADD_DEFINITIONS("-DHAVE_CONFIG_H") - - - ############################################################################################################## ########## Uninstall Setup ########## @@ -355,32 +255,8 @@ #Add our source subdirs ADD_SUBDIRECTORY(extlibs) ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(doc) -IF (NOT WANT_BUNDLE) - #Install our READMEs etc. - INSTALL(FILES - AUTHORS - ChangeLog - COPYING - INSTALL - NEWS - README - README.BINARIES - README.CMAKE - README.CODESTYLE - README.LAYOUT - README.LICENSE - README.OSX - README.RELEASE - README.SVN - README.WINDOWS - TODO - DESTINATION ${TORA_DOC_DIR} - ) -ENDIF (NOT WANT_BUNDLE) - find_package(Doxygen) if(DOXYGEN_FOUND) message(STATUS "") Modified: branches/tora3/README.CMAKE =================================================================== --- branches/tora3/README.CMAKE 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/README.CMAKE 2012-09-10 07:32:51 UTC (rev 4457) @@ -28,10 +28,6 @@ (C:\Program oieeek, error here). -Enable compilation with debugging symbols: --DWANT_DEBUG=1 - - TOra requires QScintilla2. QScintilla2 is the new Qt4 pord of old Qt3 release with new API. It's strongly recomended to use standalone package of QScintilla2. Unfortunatelly it's sometimes missing in @@ -68,15 +64,7 @@ -DENABLE_PGSQL=0 -TOra allows to be built as "bundle" application on Mac OS X. --DWANT_BUNDLE=1 -The bundle will be created in the CMAKE_INSTALL_PREFIX. The bundle -will contain all dependencies (Qt libs, DB clients libs etc.). -If there is WANT_BUNDLE specified, it can be set not to pack -all required libraries into the bundle location with: --DWANT_BUNDLE_STANDALONE=1 - Search following for more info: http://cmake.org http://docs.scribus.net/index.php?lang=en&page=install4 Modified: branches/tora3/README.OSX =================================================================== --- branches/tora3/README.OSX 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/README.OSX 2012-09-10 07:32:51 UTC (rev 4457) @@ -1,8 +1,6 @@ TOra is reported to build on Mac OS X (10.4 Tiger and later). Only Cmake build method is tested. See README.CMAKE. -Mac OS X bundle can be created with WANT_BUNDLE and optionaly WANT_BUNDLE_STANDALONE. -See README.CMAKE. Notes on Oracle Instantclient: Deleted: branches/tora3/cmake/modules/ToraCompat.cmake =================================================================== --- branches/tora3/cmake/modules/ToraCompat.cmake 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/cmake/modules/ToraCompat.cmake 2012-09-10 07:32:51 UTC (rev 4457) @@ -1,25 +0,0 @@ -# This file was copied from CMake 2.6. -# -IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) - FIND_PROGRAM(QT_LRELEASE_EXECUTABLE - NAMES lrelease - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) - - MACRO(QT4_ADD_TRANSLATION _qm_files) - FOREACH (_current_FILE ${ARGN}) - GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE) - GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE) - SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm") - - ADD_CUSTOM_COMMAND(OUTPUT ${qm} - COMMAND ${QT_LRELEASE_EXECUTABLE} - ARGS ${_abs_FILE} -qm ${qm} - DEPENDS ${_abs_FILE} - ) - SET(${_qm_files} ${${_qm_files}} ${qm}) - ENDFOREACH (_current_FILE) - ENDMACRO(QT4_ADD_TRANSLATION) -ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) - Deleted: branches/tora3/doc/CMakeLists.txt =================================================================== --- branches/tora3/doc/CMakeLists.txt 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/doc/CMakeLists.txt 2012-09-10 07:32:51 UTC (rev 4457) @@ -1 +0,0 @@ -SUBDIRS(help) Deleted: branches/tora3/doc/help/CMakeLists.txt =================================================================== --- branches/tora3/doc/help/CMakeLists.txt 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/doc/help/CMakeLists.txt 2012-09-10 07:32:51 UTC (rev 4457) @@ -1,12 +0,0 @@ -#FILE( GLOB TORA_DOC_FILES *.htm* ) -##FILE( GLOB TORA_API_FILES ./api/*.htm* ) - -#IF (WIN32) -# INSTALL(FILES ${TORA_DOC_FILES} DESTINATION help/) -## INSTALL(FILES ${TORA_API_FILES} DESTINATION help/api/) -#ELSE (WIN32) -# INSTALL(FILES ${TORA_DOC_FILES} DESTINATION ${TORA_HELP_DIR}) -## INSTALL(FILES ${TORA_API_FILES} DESTINATION ${TORA_HELP_DIR}/api/) -#ENDIF (WIN32) - -#SUBDIRS(images) Deleted: branches/tora3/doc/help/images/CMakeLists.txt =================================================================== --- branches/tora3/doc/help/images/CMakeLists.txt 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/doc/help/images/CMakeLists.txt 2012-09-10 07:32:51 UTC (rev 4457) @@ -1,2 +0,0 @@ -#FILE( GLOB TORA_DOC_IMAGES *.png ) -#INSTALL(FILES ${TORA_DOC_IMAGES} DESTINATION ${TORA_HELP_DIR}/images/) Modified: branches/tora3/extlibs/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/CMakeLists.txt 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/extlibs/CMakeLists.txt 2012-09-10 07:32:51 UTC (rev 4457) @@ -1,9 +1,9 @@ # include the stack library in dubug builds only -IF(CMAKE_BUILD_TYPE STREQUAL "Debug") +IF (TORA_DEBUG) SET (STACK_LIB "stack_lib") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extlibs/stack) ADD_SUBDIRECTORY(stack) -ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") +ENDIF (TORA_DEBUG) # loki library INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extlibs/loki/include) Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-09-07 17:11:02 UTC (rev 4456) +++ branches/tora3/src/CMakeLists.txt 2012-09-10 07:32:51 UTC (rev 4457) @@ -1,4 +1,3 @@ -INCLUDE(ToraCompat) INCLUDE(PCHSupport_26) #Subdirectories @@ -14,7 +13,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - #${CMAKE_CURRENT_SOURCE_DIR}/core ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/extlibs/loki/include ${CMAKE_SOURCE_DIR}/extlibs/otl @@ -640,23 +638,23 @@ # Handle win/mac special stuff - it's left empty for linux/unix SET (GUI_TYPE) -IF (APPLE AND WANT_BUNDLE) +IF (APPLE) SET(GUI_TYPE MACOSX_BUNDLE) SET(APPLE_BUNDLE_SOURCES icons/tora.icns) -ENDIF (APPLE AND WANT_BUNDLE) +ENDIF (APPLE) IF(WIN32) - IF (MSVC AND NOT WANT_DEBUG) + IF (MSVC AND NOT TORA_DEBUG) # this is a must to switch off subsystem:console (console window poping up) # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) SET (GUI_TYPE WIN32) - # IF (WANT_DEBUG) + # IF (TORA_DEBUG) # SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") - # ELSE (WANT_DEBUG) + # ELSE (TORA_DEBUG) # SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") - # ENDIF (WANT_DEBUG) + # ENDIF (TORA_DEBUG) ENDIF () ENDIF(WIN32) @@ -788,17 +786,13 @@ ADD_DEPENDENCIES(${PROVIDER_TERADATA} ${EXE_NAME}) ENDIF (TERADATA_FOUND) + IF (WIN32) - # Windows install - INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .) - INSTALL(FILES ${TORA_I18N_QM} DESTINATION ./i18n ) -ELSE (WIN32) - IF (NOT WANT_BUNDLE) - # Unix install - INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib) - INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora/i18n) - ELSE (NOT WANT_BUNDLE) + # Windows install + INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .) + INSTALL(FILES ${TORA_I18N_QM} DESTINATION ./i18n ) +ELSEIF (APPLE) # mac's bundle install SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/osx_tools/Info.plist.in") SET(MACOSX_BUNDLE_ICON_FILE tora.icns) @@ -813,16 +807,13 @@ INSTALL(TARGETS ${EXE_NAME} BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX}) - # handle all dependencies in the mac bundle - path fixes etc - IF (WANT_BUNDLE_STANDALONE) - configure_file(${CMAKE_SOURCE_DIR}/osx_tools/bundle.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/bundle.cmake @ONLY) - INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/bundle.cmake) - ENDIF (WANT_BUNDLE_STANDALONE) - INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/i18n) - ENDIF (NOT WANT_BUNDLE) -ENDIF (WIN32) +elseif (UNIX) + # Unix install + INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib) + INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora/i18n) +ENDIF() #set (FILES_TO_TRANSLATE ${TORA_UI_SRC} ${TORA_SOURCES} ${TORA_MOC_CLASSES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2012-09-10 14:08:29
|
Revision: 4459 http://tora.svn.sourceforge.net/tora/?rev=4459&view=rev Author: subik Date: 2012-09-10 14:08:17 +0000 (Mon, 10 Sep 2012) Log Message: ----------- make install for providers/libs Modified Paths: -------------- branches/tora3/extlibs/trotl/src/CMakeLists.txt branches/tora3/src/CMakeLists.txt branches/tora3/src/core/main.cpp Modified: branches/tora3/extlibs/trotl/src/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/trotl/src/CMakeLists.txt 2012-09-10 12:57:04 UTC (rev 4458) +++ branches/tora3/extlibs/trotl/src/CMakeLists.txt 2012-09-10 14:08:17 UTC (rev 4459) @@ -40,3 +40,6 @@ ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/src/") + +install(TARGETS ${LIB_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX}) + Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-09-10 12:57:04 UTC (rev 4458) +++ branches/tora3/src/CMakeLists.txt 2012-09-10 14:08:17 UTC (rev 4459) @@ -579,13 +579,6 @@ LIST(APPEND TORA_SOURCES connection/tooraclesetting.cpp) ENDIF(ORACLE_FOUND) -#IF (DB2_FOUND) -# LIST (APPEND TORA_SOURCES connection/db2/todb2connection.cpp -# connection/db2/db2connectionsub.cpp -# connection/db2/db2provider.cpp -# connection/db2/db2query.cpp) -# #db2/qsql_db2.cpp) -#ENDIF (DB2_FOUND) IF (USE_EXPERIMENTAL) # LIST(APPEND TORA_SOURCES docklets/tocodeoutline.cpp) @@ -716,6 +709,7 @@ # ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) ENDIF(USE_PCH) +if (0) # test1 ADD_EXECUTABLE("test1" ${GUI_TYPE} tests/test1.cpp @@ -732,7 +726,6 @@ ADD_DEPENDENCIES("test1" revisiontag) # test2 -if (FOOBAR) ADD_EXECUTABLE("test2" ${GUI_TYPE} tests/test2.cpp ${TORA_UI_SOURCES} @@ -746,7 +739,7 @@ SET_TARGET_PROPERTIES("test2" PROPERTIES ENABLE_EXPORTS ON) # explicitly say that the executable depends on the svnheader ADD_DEPENDENCIES("test2" revisiontag) -endif(FOOBAR) +endif(0) IF(USE_PCH) IF(CMAKE_GENERATOR MATCHES Visual*) @@ -756,7 +749,7 @@ # ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test2") ELSE(CMAKE_GENERATOR MATCHES Visual*) ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) - ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) +# ADD_PRECOMPILED_HEADER("test1" ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) ENDIF(CMAKE_GENERATOR MATCHES Visual*) ENDIF(USE_PCH) @@ -773,7 +766,7 @@ TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} "trotl") # TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} test1 "trotl") ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${EXE_NAME}) - MESSAGE(STATUS "${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} trotl") + MESSAGE(STATUS "${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} trotl") ENDIF(ORACLE_FOUND) # Teradata connection provider @@ -786,7 +779,6 @@ ADD_DEPENDENCIES(${PROVIDER_TERADATA} ${EXE_NAME}) ENDIF (TERADATA_FOUND) - IF (WIN32) # Windows install INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION .) @@ -811,8 +803,11 @@ elseif (UNIX) # Unix install - INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib) - INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora/i18n) + install(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX}) + install(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora/i18n) + install(TARGETS ${PROVIDER_ORACLE} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX}/tora-${VERSION}) + install(TARGETS ${PROVIDER_TERADATA} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX}/tora-${VERSION}) + add_definitions(-DPROVIDERS_PATH=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/tora-${VERSION}\") ENDIF() Modified: branches/tora3/src/core/main.cpp =================================================================== --- branches/tora3/src/core/main.cpp 2012-09-10 12:57:04 UTC (rev 4458) +++ branches/tora3/src/core/main.cpp 2012-09-10 14:08:17 UTC (rev 4459) @@ -144,6 +144,10 @@ } #endif +#ifdef PROVIDERS_PATH + QCoreApplication::addLibraryPath(PROVIDERS_PATH); +#endif + // List of all connection provider finders std::vector<std::string> finders = ConnectionProviderFinderFactory::Instance().keys(); // Resulting list of all the providers found This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-09-12 07:35:04
|
Revision: 4461 http://tora.svn.sourceforge.net/tora/?rev=4461&view=rev Author: ibre5041 Date: 2012-09-12 07:34:55 +0000 (Wed, 12 Sep 2012) Log Message: ----------- Threre is no 64bit win build for graphvwiz Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/extlibs/CMakeLists.txt branches/tora3/extlibs/parsing/CMakeLists.txt branches/tora3/extlibs/trotl/src/CMakeLists.txt branches/tora3/src/CMakeLists.txt branches/tora3/src/connection/tooraclefind.cpp branches/tora3/src/connection/toteradatafind.cpp Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-09-10 21:39:44 UTC (rev 4460) +++ branches/tora3/CMakeLists.txt 2012-09-12 07:34:55 UTC (rev 4461) @@ -42,6 +42,13 @@ ADD_DEFINITIONS("-DHAVE_SVNREVISION_H=1") ENDIF(Subversion_FOUND) +# Boost headers are required to compile with -DDEBUG (see tologger.h) and also for trotl sql parser +FIND_PACKAGE(Boost REQUIRED) +IF (Boost_FOUND) + MESSAGE(STATUS "Found Boost libraries for debug build: ${Boost_INCLUDE_DIRS}") +ELSE (Boost_FOUND) + MESSAGE(FATAL "Boost libs not found. It's mandatory to build with debugging") +ENDIF (Boost_FOUND) #Project Setup PROJECT(TOra) @@ -86,16 +93,6 @@ set(CMAKE_BUILD_TYPE Debug) add_definitions(-DDEBUG) set(TORA_DEBUG 1) - - if (0) - # Boost headers are required to compile with -DDEBUG (see tologger.h) - FIND_PACKAGE(Boost REQUIRED) - IF (Boost_FOUND) - MESSAGE(STATUS "Found Boost libraries for debug build: ${Boost_INCLUDE_DIRS}") - else (Boost_FOUND) - MESSAGE(FATAL "Boost libs not found. It's mandatory to build with debugging") - ENDIF (Boost_FOUND) - endif() else() message(STATUS "non-debug build") set(TORA_DEBUG 0) Modified: branches/tora3/extlibs/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/CMakeLists.txt 2012-09-10 21:39:44 UTC (rev 4460) +++ branches/tora3/extlibs/CMakeLists.txt 2012-09-12 07:34:55 UTC (rev 4461) @@ -23,9 +23,9 @@ ADD_SUBDIRECTORY(libantlr3c-3.3) ADD_SUBDIRECTORY(parsing) -IF (USE_EXPERIMENTAL) +IF (graphviz_FOUND) ADD_SUBDIRECTORY(libermodel) -ENDIF(USE_EXPERIMENTAL) +ENDIF(graphviz_FOUND) Modified: branches/tora3/extlibs/parsing/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/parsing/CMakeLists.txt 2012-09-10 21:39:44 UTC (rev 4460) +++ branches/tora3/extlibs/parsing/CMakeLists.txt 2012-09-12 07:34:55 UTC (rev 4461) @@ -20,6 +20,7 @@ ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3/include ${CMAKE_BINARY_DIR}/extlibs/libantlr3c-3.3 # generated antlr3config.h ${CMAKE_SOURCE_DIR}/src # core/tologger.h + ${Boost_INCLUDE_DIRS} ) ADD_DEFINITIONS("-DTSQLPARSER_MAKE_DLL") Modified: branches/tora3/extlibs/trotl/src/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/trotl/src/CMakeLists.txt 2012-09-10 21:39:44 UTC (rev 4460) +++ branches/tora3/extlibs/trotl/src/CMakeLists.txt 2012-09-12 07:34:55 UTC (rev 4461) @@ -1,5 +1,6 @@ INCLUDE_DIRECTORIES( ${ORACLE_INCLUDES} + ${Boost_INCLUDE_DIRS} ) SET(TROTL_SOURCES Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-09-10 21:39:44 UTC (rev 4460) +++ branches/tora3/src/CMakeLists.txt 2012-09-12 07:34:55 UTC (rev 4461) @@ -19,7 +19,7 @@ ${CMAKE_SOURCE_DIR}/extlibs/trotl/src ${CMAKE_SOURCE_DIR}/extlibs/parsing ${CMAKE_SOURCE_DIR}/extlibs/libermodel - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${QT_INCLUDES} ) @@ -613,13 +613,13 @@ QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES}) QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) -IF (WIN32) - LINK_DIRECTORIES(./windows) -ENDIF (WIN32) +# IF (WIN32) +# LINK_DIRECTORIES(./windows) +# ENDIF (WIN32) -IF (WANT_INTERNAL_QSCINTILLA) - LINK_DIRECTORIES(./qscintilla2) -ENDIF (WANT_INTERNAL_QSCINTILLA) +# IF (WANT_INTERNAL_QSCINTILLA) +# LINK_DIRECTORIES(./qscintilla2) +# ENDIF (WANT_INTERNAL_QSCINTILLA) IF (WANT_INTERNAL_QSCINTILLA) SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) Modified: branches/tora3/src/connection/tooraclefind.cpp =================================================================== --- branches/tora3/src/connection/tooraclefind.cpp 2012-09-10 21:39:44 UTC (rev 4460) +++ branches/tora3/src/connection/tooraclefind.cpp 2012-09-12 07:34:55 UTC (rev 4461) @@ -329,6 +329,19 @@ Utils::toLibrary::LHandle hmoduleOCI = Utils::toLibrary::loadLibrary(libPath); if ( hmoduleOCI) TLOG(5, toNoDecorator, __HERE__) << "OK" << std::endl; + + TLOG(5, toNoDecorator, __HERE__) << "Loading: " TROTL_LIB << std::endl; + Utils::toLibrary::LHandle hmoduleTrotl = Utils::toLibrary::loadLibrary(QFileInfo(TROTL_LIB)); + if ( hmoduleTrotl) + TLOG(5, toNoDecorator, __HERE__) << "OK" << std::endl; + + TLOG(5, toNoDecorator, __HERE__) << "Loading: " PROVIDER_LIB << std::endl; + Utils::toLibrary::LHandle hmodulePOracle = Utils::toLibrary::loadLibrary(QFileInfo(PROVIDER_LIB)); + if ( hmodulePOracle) + TLOG(5, toNoDecorator, __HERE__) << "OK" << std::endl; + else + TLOG(5, toNoDecorator, __HERE__) << "Failed" << std::endl; + #else /* Steps to load libclntsh.so on Linux All these approaches fail: @@ -372,7 +385,6 @@ retval = symlink(PROVIDERS_PATH "/../" TROTL_LIB, TROTL_LIB); if(retval) TLOG(5, toNoDecorator, __HERE__) << strerror(retval) << std::endl; -#endif TLOG(5, toNoDecorator, __HERE__) << "Loading: " TROTL_LIB << std::endl; Utils::toLibrary::LHandle hmoduleTrotl = Utils::toLibrary::loadLibrary(QFileInfo(TROTL_LIB)); @@ -382,10 +394,14 @@ TLOG(5, toNoDecorator, __HERE__) << "Loading: " PROVIDER_LIB << std::endl; Utils::toLibrary::LHandle hmodulePOracle = Utils::toLibrary::loadLibrary(QFileInfo(QDir(PROVIDERS_PATH), PROVIDER_LIB)); if ( hmodulePOracle) - TLOG(5, toNoDecorator, __HERE__) << "OK" << std::endl; + TLOG(5, toNoDecorator, __HERE__) << "OK" << std::endl; + else + TLOG(5, toNoDecorator, __HERE__) << "Failed" << std::endl; if( !QDir::setCurrent(toraHome.absolutePath())) - throw QString("Could change cwd: %1").arg(toraHome.absolutePath()); + throw QString("Could change cwd: %1").arg(toraHome.absolutePath()); + +#endif } void toOracleInstantFinder::load(ConnectionProvirerParams const ¶ms) Modified: branches/tora3/src/connection/toteradatafind.cpp =================================================================== --- branches/tora3/src/connection/toteradatafind.cpp 2012-09-10 21:39:44 UTC (rev 4460) +++ branches/tora3/src/connection/toteradatafind.cpp 2012-09-12 07:34:55 UTC (rev 4461) @@ -212,7 +212,11 @@ TLOG(5, toNoDecorator, __HERE__) << "OK" << std::endl; TLOG(5, toNoDecorator, __HERE__) << "Loading: " PROVIDER_LIB << std::endl; +#ifdef Q_OS_WIN32 + Utils::toLibrary::LHandle hmodulePTeradata = Utils::toLibrary::loadLibrary(QFileInfo(PROVIDER_LIB)); +#else Utils::toLibrary::LHandle hmodulePTeradata = Utils::toLibrary::loadLibrary(QFileInfo(QDir(PROVIDERS_PATH), PROVIDER_LIB)); +#endif if ( hmodulePTeradata) TLOG(5, toNoDecorator, __HERE__) << "OK" << std::endl; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-09-12 09:52:27
|
Revision: 4463 http://tora.svn.sourceforge.net/tora/?rev=4463&view=rev Author: ibre5041 Date: 2012-09-12 09:52:17 +0000 (Wed, 12 Sep 2012) Log Message: ----------- MSVC Compile fixes(release build) Modified Paths: -------------- branches/tora3/extlibs/trotl/src/CMakeLists.txt branches/tora3/extlibs/trotl/src/trotl_common.h branches/tora3/src/CMakeLists.txt Modified: branches/tora3/extlibs/trotl/src/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/trotl/src/CMakeLists.txt 2012-09-12 08:43:04 UTC (rev 4462) +++ branches/tora3/extlibs/trotl/src/CMakeLists.txt 2012-09-12 09:52:17 UTC (rev 4463) @@ -1,4 +1,5 @@ INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}/extlibs/stack ${ORACLE_INCLUDES} ${Boost_INCLUDE_DIRS} ) Modified: branches/tora3/extlibs/trotl/src/trotl_common.h =================================================================== --- branches/tora3/extlibs/trotl/src/trotl_common.h 2012-09-12 08:43:04 UTC (rev 4462) +++ branches/tora3/extlibs/trotl/src/trotl_common.h 2012-09-12 09:52:17 UTC (rev 4463) @@ -139,9 +139,9 @@ }; // MSVC Debug build -#if defined(_DEBUG) && !defined(DEBUG) -#define DEBUG -#endif +//#if defined(_DEBUG) && !defined(DEBUG) +//#define DEBUG +//#endif #ifdef DEBUG #ifdef __GNUC__ Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-09-12 08:43:04 UTC (rev 4462) +++ branches/tora3/src/CMakeLists.txt 2012-09-12 09:52:17 UTC (rev 4463) @@ -18,7 +18,6 @@ ${CMAKE_SOURCE_DIR}/extlibs/otl ${CMAKE_SOURCE_DIR}/extlibs/trotl/src ${CMAKE_SOURCE_DIR}/extlibs/parsing - ${CMAKE_SOURCE_DIR}/extlibs/libermodel ${Boost_INCLUDE_DIRS} ${QT_INCLUDES} ) @@ -53,7 +52,10 @@ ENDIF (POPPLER_QT4_FOUND) IF(graphviz_FOUND) - INCLUDE_DIRECTORIES(${graphviz_INCLUDE_DIRECTORIES}) + INCLUDE_DIRECTORIES( + ${graphviz_INCLUDE_DIRECTORIES} + ${CMAKE_SOURCE_DIR}/extlibs/libermodel + ) ENDIF(graphviz_FOUND) # only toad bindings are here. All others qm files will blow the binary too much This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-09-12 09:55:16
|
Revision: 4464 http://tora.svn.sourceforge.net/tora/?rev=4464&view=rev Author: ibre5041 Date: 2012-09-12 09:55:04 +0000 (Wed, 12 Sep 2012) Log Message: ----------- Windows NMAKE based build Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/TODO branches/tora3/extlibs/libermodel/CMakeLists.txt branches/tora3/src/CMakeLists.txt branches/tora3/src/windows/CMakeLists.txt Removed Paths: ------------- branches/tora3/extlibs/libantlr3c-3.3/Makefile branches/tora3/src/windows/Makefile Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-09-12 09:52:17 UTC (rev 4463) +++ branches/tora3/CMakeLists.txt 2012-09-12 09:55:04 UTC (rev 4464) @@ -8,7 +8,7 @@ OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON) OPTION(ENABLE_TERADATA "Enable/Disable Teradata support." ON) OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" OFF) -OPTION(USE_PCH "Use percompiled headers" ON) +OPTION(USE_PCH "Use percompiled headers" OFF) OPTION(USE_EXPERIMENTAL "Use experimental code" ON) #Set our CMake minimum version @@ -29,15 +29,14 @@ #Set the custom CMake module directory where our include/lib finders are SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") - # Check for SVN to include SVn revision in SVN based builds FIND_PACKAGE(Subversion) IF (Subversion_FOUND) # a custom target that is always built add_custom_target(revisiontag ALL) # creates svnheader.h using cmake script - add_custom_command(TARGET revisiontag COMMAND ${CMAKE_COMMAND} - -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} + add_custom_command(TARGET revisiontag COMMAND ${CMAKE_COMMAND} + -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/getsvn.cmake) ADD_DEFINITIONS("-DHAVE_SVNREVISION_H=1") ENDIF(Subversion_FOUND) Modified: branches/tora3/TODO =================================================================== --- branches/tora3/TODO 2012-09-12 09:52:17 UTC (rev 4463) +++ branches/tora3/TODO 2012-09-12 09:55:04 UTC (rev 4464) @@ -1,3 +1,8 @@ +Core: + +qobject_cast<> vs. dynamic_cast<> +Q_INTERFACE macro + QSscintilla port: * More integrated QScintilla features (toMarkedText class) Deleted: branches/tora3/extlibs/libantlr3c-3.3/Makefile =================================================================== --- branches/tora3/extlibs/libantlr3c-3.3/Makefile 2012-09-12 09:52:17 UTC (rev 4463) +++ branches/tora3/extlibs/libantlr3c-3.3/Makefile 2012-09-12 09:55:04 UTC (rev 4464) @@ -1,754 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -# Default target executed when no arguments are given to make. -default_target: all -.PHONY : default_target - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canoncical targets will work. -.SUFFIXES: - -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = - -.SUFFIXES: .hpux_make_needs_suffix_list - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - -# A target that is always out of date. -cmake_force: -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /usr/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E remove -f - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/ivan/devel/tora-trotl/src/libantlr3c-3.3 - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/ivan/devel/tora-trotl/src/libantlr3c-3.3 - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..." - /usr/bin/cmake -i . -.PHONY : edit_cache - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache -.PHONY : edit_cache/fast - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : rebuild_cache - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache -.PHONY : rebuild_cache/fast - -# The main all target -all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/ivan/devel/tora-trotl/src/libantlr3c-3.3/CMakeFiles /home/ivan/devel/tora-trotl/src/libantlr3c-3.3/CMakeFiles/progress.marks - $(MAKE) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /home/ivan/devel/tora-trotl/src/libantlr3c-3.3/CMakeFiles 0 -.PHONY : all - -# The main clean target -clean: - $(MAKE) -f CMakeFiles/Makefile2 clean -.PHONY : clean - -# The main clean target -clean/fast: clean -.PHONY : clean/fast - -# Prepare targets for installation. -preinstall: all - $(MAKE) -f CMakeFiles/Makefile2 preinstall -.PHONY : preinstall - -# Prepare targets for installation. -preinstall/fast: - $(MAKE) -f CMakeFiles/Makefile2 preinstall -.PHONY : preinstall/fast - -# clear depends -depend: - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -.PHONY : depend - -#============================================================================= -# Target rules for targets named antlr3c - -# Build rule for target. -antlr3c: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 antlr3c -.PHONY : antlr3c - -# fast build rule for target. -antlr3c/fast: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/build -.PHONY : antlr3c/fast - -src/antlr3baserecognizer.o: src/antlr3baserecognizer.c.o -.PHONY : src/antlr3baserecognizer.o - -# target to build an object file -src/antlr3baserecognizer.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3baserecognizer.c.o -.PHONY : src/antlr3baserecognizer.c.o - -src/antlr3baserecognizer.i: src/antlr3baserecognizer.c.i -.PHONY : src/antlr3baserecognizer.i - -# target to preprocess a source file -src/antlr3baserecognizer.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3baserecognizer.c.i -.PHONY : src/antlr3baserecognizer.c.i - -src/antlr3baserecognizer.s: src/antlr3baserecognizer.c.s -.PHONY : src/antlr3baserecognizer.s - -# target to generate assembly for a file -src/antlr3baserecognizer.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3baserecognizer.c.s -.PHONY : src/antlr3baserecognizer.c.s - -src/antlr3basetree.o: src/antlr3basetree.c.o -.PHONY : src/antlr3basetree.o - -# target to build an object file -src/antlr3basetree.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3basetree.c.o -.PHONY : src/antlr3basetree.c.o - -src/antlr3basetree.i: src/antlr3basetree.c.i -.PHONY : src/antlr3basetree.i - -# target to preprocess a source file -src/antlr3basetree.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3basetree.c.i -.PHONY : src/antlr3basetree.c.i - -src/antlr3basetree.s: src/antlr3basetree.c.s -.PHONY : src/antlr3basetree.s - -# target to generate assembly for a file -src/antlr3basetree.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3basetree.c.s -.PHONY : src/antlr3basetree.c.s - -src/antlr3basetreeadaptor.o: src/antlr3basetreeadaptor.c.o -.PHONY : src/antlr3basetreeadaptor.o - -# target to build an object file -src/antlr3basetreeadaptor.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3basetreeadaptor.c.o -.PHONY : src/antlr3basetreeadaptor.c.o - -src/antlr3basetreeadaptor.i: src/antlr3basetreeadaptor.c.i -.PHONY : src/antlr3basetreeadaptor.i - -# target to preprocess a source file -src/antlr3basetreeadaptor.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3basetreeadaptor.c.i -.PHONY : src/antlr3basetreeadaptor.c.i - -src/antlr3basetreeadaptor.s: src/antlr3basetreeadaptor.c.s -.PHONY : src/antlr3basetreeadaptor.s - -# target to generate assembly for a file -src/antlr3basetreeadaptor.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3basetreeadaptor.c.s -.PHONY : src/antlr3basetreeadaptor.c.s - -src/antlr3bitset.o: src/antlr3bitset.c.o -.PHONY : src/antlr3bitset.o - -# target to build an object file -src/antlr3bitset.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3bitset.c.o -.PHONY : src/antlr3bitset.c.o - -src/antlr3bitset.i: src/antlr3bitset.c.i -.PHONY : src/antlr3bitset.i - -# target to preprocess a source file -src/antlr3bitset.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3bitset.c.i -.PHONY : src/antlr3bitset.c.i - -src/antlr3bitset.s: src/antlr3bitset.c.s -.PHONY : src/antlr3bitset.s - -# target to generate assembly for a file -src/antlr3bitset.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3bitset.c.s -.PHONY : src/antlr3bitset.c.s - -src/antlr3collections.o: src/antlr3collections.c.o -.PHONY : src/antlr3collections.o - -# target to build an object file -src/antlr3collections.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3collections.c.o -.PHONY : src/antlr3collections.c.o - -src/antlr3collections.i: src/antlr3collections.c.i -.PHONY : src/antlr3collections.i - -# target to preprocess a source file -src/antlr3collections.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3collections.c.i -.PHONY : src/antlr3collections.c.i - -src/antlr3collections.s: src/antlr3collections.c.s -.PHONY : src/antlr3collections.s - -# target to generate assembly for a file -src/antlr3collections.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3collections.c.s -.PHONY : src/antlr3collections.c.s - -src/antlr3commontoken.o: src/antlr3commontoken.c.o -.PHONY : src/antlr3commontoken.o - -# target to build an object file -src/antlr3commontoken.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontoken.c.o -.PHONY : src/antlr3commontoken.c.o - -src/antlr3commontoken.i: src/antlr3commontoken.c.i -.PHONY : src/antlr3commontoken.i - -# target to preprocess a source file -src/antlr3commontoken.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontoken.c.i -.PHONY : src/antlr3commontoken.c.i - -src/antlr3commontoken.s: src/antlr3commontoken.c.s -.PHONY : src/antlr3commontoken.s - -# target to generate assembly for a file -src/antlr3commontoken.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontoken.c.s -.PHONY : src/antlr3commontoken.c.s - -src/antlr3commontree.o: src/antlr3commontree.c.o -.PHONY : src/antlr3commontree.o - -# target to build an object file -src/antlr3commontree.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontree.c.o -.PHONY : src/antlr3commontree.c.o - -src/antlr3commontree.i: src/antlr3commontree.c.i -.PHONY : src/antlr3commontree.i - -# target to preprocess a source file -src/antlr3commontree.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontree.c.i -.PHONY : src/antlr3commontree.c.i - -src/antlr3commontree.s: src/antlr3commontree.c.s -.PHONY : src/antlr3commontree.s - -# target to generate assembly for a file -src/antlr3commontree.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontree.c.s -.PHONY : src/antlr3commontree.c.s - -src/antlr3commontreeadaptor.o: src/antlr3commontreeadaptor.c.o -.PHONY : src/antlr3commontreeadaptor.o - -# target to build an object file -src/antlr3commontreeadaptor.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontreeadaptor.c.o -.PHONY : src/antlr3commontreeadaptor.c.o - -src/antlr3commontreeadaptor.i: src/antlr3commontreeadaptor.c.i -.PHONY : src/antlr3commontreeadaptor.i - -# target to preprocess a source file -src/antlr3commontreeadaptor.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontreeadaptor.c.i -.PHONY : src/antlr3commontreeadaptor.c.i - -src/antlr3commontreeadaptor.s: src/antlr3commontreeadaptor.c.s -.PHONY : src/antlr3commontreeadaptor.s - -# target to generate assembly for a file -src/antlr3commontreeadaptor.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontreeadaptor.c.s -.PHONY : src/antlr3commontreeadaptor.c.s - -src/antlr3commontreenodestream.o: src/antlr3commontreenodestream.c.o -.PHONY : src/antlr3commontreenodestream.o - -# target to build an object file -src/antlr3commontreenodestream.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontreenodestream.c.o -.PHONY : src/antlr3commontreenodestream.c.o - -src/antlr3commontreenodestream.i: src/antlr3commontreenodestream.c.i -.PHONY : src/antlr3commontreenodestream.i - -# target to preprocess a source file -src/antlr3commontreenodestream.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontreenodestream.c.i -.PHONY : src/antlr3commontreenodestream.c.i - -src/antlr3commontreenodestream.s: src/antlr3commontreenodestream.c.s -.PHONY : src/antlr3commontreenodestream.s - -# target to generate assembly for a file -src/antlr3commontreenodestream.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3commontreenodestream.c.s -.PHONY : src/antlr3commontreenodestream.c.s - -src/antlr3convertutf.o: src/antlr3convertutf.c.o -.PHONY : src/antlr3convertutf.o - -# target to build an object file -src/antlr3convertutf.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3convertutf.c.o -.PHONY : src/antlr3convertutf.c.o - -src/antlr3convertutf.i: src/antlr3convertutf.c.i -.PHONY : src/antlr3convertutf.i - -# target to preprocess a source file -src/antlr3convertutf.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3convertutf.c.i -.PHONY : src/antlr3convertutf.c.i - -src/antlr3convertutf.s: src/antlr3convertutf.c.s -.PHONY : src/antlr3convertutf.s - -# target to generate assembly for a file -src/antlr3convertutf.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3convertutf.c.s -.PHONY : src/antlr3convertutf.c.s - -src/antlr3cyclicdfa.o: src/antlr3cyclicdfa.c.o -.PHONY : src/antlr3cyclicdfa.o - -# target to build an object file -src/antlr3cyclicdfa.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3cyclicdfa.c.o -.PHONY : src/antlr3cyclicdfa.c.o - -src/antlr3cyclicdfa.i: src/antlr3cyclicdfa.c.i -.PHONY : src/antlr3cyclicdfa.i - -# target to preprocess a source file -src/antlr3cyclicdfa.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3cyclicdfa.c.i -.PHONY : src/antlr3cyclicdfa.c.i - -src/antlr3cyclicdfa.s: src/antlr3cyclicdfa.c.s -.PHONY : src/antlr3cyclicdfa.s - -# target to generate assembly for a file -src/antlr3cyclicdfa.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3cyclicdfa.c.s -.PHONY : src/antlr3cyclicdfa.c.s - -src/antlr3debughandlers.o: src/antlr3debughandlers.c.o -.PHONY : src/antlr3debughandlers.o - -# target to build an object file -src/antlr3debughandlers.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3debughandlers.c.o -.PHONY : src/antlr3debughandlers.c.o - -src/antlr3debughandlers.i: src/antlr3debughandlers.c.i -.PHONY : src/antlr3debughandlers.i - -# target to preprocess a source file -src/antlr3debughandlers.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3debughandlers.c.i -.PHONY : src/antlr3debughandlers.c.i - -src/antlr3debughandlers.s: src/antlr3debughandlers.c.s -.PHONY : src/antlr3debughandlers.s - -# target to generate assembly for a file -src/antlr3debughandlers.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3debughandlers.c.s -.PHONY : src/antlr3debughandlers.c.s - -src/antlr3encodings.o: src/antlr3encodings.c.o -.PHONY : src/antlr3encodings.o - -# target to build an object file -src/antlr3encodings.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3encodings.c.o -.PHONY : src/antlr3encodings.c.o - -src/antlr3encodings.i: src/antlr3encodings.c.i -.PHONY : src/antlr3encodings.i - -# target to preprocess a source file -src/antlr3encodings.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3encodings.c.i -.PHONY : src/antlr3encodings.c.i - -src/antlr3encodings.s: src/antlr3encodings.c.s -.PHONY : src/antlr3encodings.s - -# target to generate assembly for a file -src/antlr3encodings.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3encodings.c.s -.PHONY : src/antlr3encodings.c.s - -src/antlr3exception.o: src/antlr3exception.c.o -.PHONY : src/antlr3exception.o - -# target to build an object file -src/antlr3exception.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3exception.c.o -.PHONY : src/antlr3exception.c.o - -src/antlr3exception.i: src/antlr3exception.c.i -.PHONY : src/antlr3exception.i - -# target to preprocess a source file -src/antlr3exception.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3exception.c.i -.PHONY : src/antlr3exception.c.i - -src/antlr3exception.s: src/antlr3exception.c.s -.PHONY : src/antlr3exception.s - -# target to generate assembly for a file -src/antlr3exception.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3exception.c.s -.PHONY : src/antlr3exception.c.s - -src/antlr3filestream.o: src/antlr3filestream.c.o -.PHONY : src/antlr3filestream.o - -# target to build an object file -src/antlr3filestream.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3filestream.c.o -.PHONY : src/antlr3filestream.c.o - -src/antlr3filestream.i: src/antlr3filestream.c.i -.PHONY : src/antlr3filestream.i - -# target to preprocess a source file -src/antlr3filestream.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3filestream.c.i -.PHONY : src/antlr3filestream.c.i - -src/antlr3filestream.s: src/antlr3filestream.c.s -.PHONY : src/antlr3filestream.s - -# target to generate assembly for a file -src/antlr3filestream.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3filestream.c.s -.PHONY : src/antlr3filestream.c.s - -src/antlr3inputstream.o: src/antlr3inputstream.c.o -.PHONY : src/antlr3inputstream.o - -# target to build an object file -src/antlr3inputstream.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3inputstream.c.o -.PHONY : src/antlr3inputstream.c.o - -src/antlr3inputstream.i: src/antlr3inputstream.c.i -.PHONY : src/antlr3inputstream.i - -# target to preprocess a source file -src/antlr3inputstream.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3inputstream.c.i -.PHONY : src/antlr3inputstream.c.i - -src/antlr3inputstream.s: src/antlr3inputstream.c.s -.PHONY : src/antlr3inputstream.s - -# target to generate assembly for a file -src/antlr3inputstream.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3inputstream.c.s -.PHONY : src/antlr3inputstream.c.s - -src/antlr3intstream.o: src/antlr3intstream.c.o -.PHONY : src/antlr3intstream.o - -# target to build an object file -src/antlr3intstream.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3intstream.c.o -.PHONY : src/antlr3intstream.c.o - -src/antlr3intstream.i: src/antlr3intstream.c.i -.PHONY : src/antlr3intstream.i - -# target to preprocess a source file -src/antlr3intstream.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3intstream.c.i -.PHONY : src/antlr3intstream.c.i - -src/antlr3intstream.s: src/antlr3intstream.c.s -.PHONY : src/antlr3intstream.s - -# target to generate assembly for a file -src/antlr3intstream.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3intstream.c.s -.PHONY : src/antlr3intstream.c.s - -src/antlr3lexer.o: src/antlr3lexer.c.o -.PHONY : src/antlr3lexer.o - -# target to build an object file -src/antlr3lexer.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3lexer.c.o -.PHONY : src/antlr3lexer.c.o - -src/antlr3lexer.i: src/antlr3lexer.c.i -.PHONY : src/antlr3lexer.i - -# target to preprocess a source file -src/antlr3lexer.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3lexer.c.i -.PHONY : src/antlr3lexer.c.i - -src/antlr3lexer.s: src/antlr3lexer.c.s -.PHONY : src/antlr3lexer.s - -# target to generate assembly for a file -src/antlr3lexer.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3lexer.c.s -.PHONY : src/antlr3lexer.c.s - -src/antlr3parser.o: src/antlr3parser.c.o -.PHONY : src/antlr3parser.o - -# target to build an object file -src/antlr3parser.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3parser.c.o -.PHONY : src/antlr3parser.c.o - -src/antlr3parser.i: src/antlr3parser.c.i -.PHONY : src/antlr3parser.i - -# target to preprocess a source file -src/antlr3parser.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3parser.c.i -.PHONY : src/antlr3parser.c.i - -src/antlr3parser.s: src/antlr3parser.c.s -.PHONY : src/antlr3parser.s - -# target to generate assembly for a file -src/antlr3parser.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3parser.c.s -.PHONY : src/antlr3parser.c.s - -src/antlr3rewritestreams.o: src/antlr3rewritestreams.c.o -.PHONY : src/antlr3rewritestreams.o - -# target to build an object file -src/antlr3rewritestreams.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3rewritestreams.c.o -.PHONY : src/antlr3rewritestreams.c.o - -src/antlr3rewritestreams.i: src/antlr3rewritestreams.c.i -.PHONY : src/antlr3rewritestreams.i - -# target to preprocess a source file -src/antlr3rewritestreams.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3rewritestreams.c.i -.PHONY : src/antlr3rewritestreams.c.i - -src/antlr3rewritestreams.s: src/antlr3rewritestreams.c.s -.PHONY : src/antlr3rewritestreams.s - -# target to generate assembly for a file -src/antlr3rewritestreams.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3rewritestreams.c.s -.PHONY : src/antlr3rewritestreams.c.s - -src/antlr3string.o: src/antlr3string.c.o -.PHONY : src/antlr3string.o - -# target to build an object file -src/antlr3string.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3string.c.o -.PHONY : src/antlr3string.c.o - -src/antlr3string.i: src/antlr3string.c.i -.PHONY : src/antlr3string.i - -# target to preprocess a source file -src/antlr3string.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3string.c.i -.PHONY : src/antlr3string.c.i - -src/antlr3string.s: src/antlr3string.c.s -.PHONY : src/antlr3string.s - -# target to generate assembly for a file -src/antlr3string.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3string.c.s -.PHONY : src/antlr3string.c.s - -src/antlr3tokenstream.o: src/antlr3tokenstream.c.o -.PHONY : src/antlr3tokenstream.o - -# target to build an object file -src/antlr3tokenstream.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3tokenstream.c.o -.PHONY : src/antlr3tokenstream.c.o - -src/antlr3tokenstream.i: src/antlr3tokenstream.c.i -.PHONY : src/antlr3tokenstream.i - -# target to preprocess a source file -src/antlr3tokenstream.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3tokenstream.c.i -.PHONY : src/antlr3tokenstream.c.i - -src/antlr3tokenstream.s: src/antlr3tokenstream.c.s -.PHONY : src/antlr3tokenstream.s - -# target to generate assembly for a file -src/antlr3tokenstream.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3tokenstream.c.s -.PHONY : src/antlr3tokenstream.c.s - -src/antlr3treeparser.o: src/antlr3treeparser.c.o -.PHONY : src/antlr3treeparser.o - -# target to build an object file -src/antlr3treeparser.c.o: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3treeparser.c.o -.PHONY : src/antlr3treeparser.c.o - -src/antlr3treeparser.i: src/antlr3treeparser.c.i -.PHONY : src/antlr3treeparser.i - -# target to preprocess a source file -src/antlr3treeparser.c.i: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3treeparser.c.i -.PHONY : src/antlr3treeparser.c.i - -src/antlr3treeparser.s: src/antlr3treeparser.c.s -.PHONY : src/antlr3treeparser.s - -# target to generate assembly for a file -src/antlr3treeparser.c.s: - $(MAKE) -f CMakeFiles/antlr3c.dir/build.make CMakeFiles/antlr3c.dir/src/antlr3treeparser.c.s -.PHONY : src/antlr3treeparser.c.s - -# Help Target -help: - @echo "The following are some of the valid targets for this Makefile:" - @echo "... all (the default if no target is provided)" - @echo "... clean" - @echo "... depend" - @echo "... antlr3c" - @echo "... edit_cache" - @echo "... rebuild_cache" - @echo "... src/antlr3baserecognizer.o" - @echo "... src/antlr3baserecognizer.i" - @echo "... src/antlr3baserecognizer.s" - @echo "... src/antlr3basetree.o" - @echo "... src/antlr3basetree.i" - @echo "... src/antlr3basetree.s" - @echo "... src/antlr3basetreeadaptor.o" - @echo "... src/antlr3basetreeadaptor.i" - @echo "... src/antlr3basetreeadaptor.s" - @echo "... src/antlr3bitset.o" - @echo "... src/antlr3bitset.i" - @echo "... src/antlr3bitset.s" - @echo "... src/antlr3collections.o" - @echo "... src/antlr3collections.i" - @echo "... src/antlr3collections.s" - @echo "... src/antlr3commontoken.o" - @echo "... src/antlr3commontoken.i" - @echo "... src/antlr3commontoken.s" - @echo "... src/antlr3commontree.o" - @echo "... src/antlr3commontree.i" - @echo "... src/antlr3commontree.s" - @echo "... src/antlr3commontreeadaptor.o" - @echo "... src/antlr3commontreeadaptor.i" - @echo "... src/antlr3commontreeadaptor.s" - @echo "... src/antlr3commontreenodestream.o" - @echo "... src/antlr3commontreenodestream.i" - @echo "... src/antlr3commontreenodestream.s" - @echo "... src/antlr3convertutf.o" - @echo "... src/antlr3convertutf.i" - @echo "... src/antlr3convertutf.s" - @echo "... src/antlr3cyclicdfa.o" - @echo "... src/antlr3cyclicdfa.i" - @echo "... src/antlr3cyclicdfa.s" - @echo "... src/antlr3debughandlers.o" - @echo "... src/antlr3debughandlers.i" - @echo "... src/antlr3debughandlers.s" - @echo "... src/antlr3encodings.o" - @echo "... src/antlr3encodings.i" - @echo "... src/antlr3encodings.s" - @echo "... src/antlr3exception.o" - @echo "... src/antlr3exception.i" - @echo "... src/antlr3exception.s" - @echo "... src/antlr3filestream.o" - @echo "... src/antlr3filestream.i" - @echo "... src/antlr3filestream.s" - @echo "... src/antlr3inputstream.o" - @echo "... src/antlr3inputstream.i" - @echo "... src/antlr3inputstream.s" - @echo "... src/antlr3intstream.o" - @echo "... src/antlr3intstream.i" - @echo "... src/antlr3intstream.s" - @echo "... src/antlr3lexer.o" - @echo "... src/antlr3lexer.i" - @echo "... src/antlr3lexer.s" - @echo "... src/antlr3parser.o" - @echo "... src/antlr3parser.i" - @echo "... src/antlr3parser.s" - @echo "... src/antlr3rewritestreams.o" - @echo "... src/antlr3rewritestreams.i" - @echo "... src/antlr3rewritestreams.s" - @echo "... src/antlr3string.o" - @echo "... src/antlr3string.i" - @echo "... src/antlr3string.s" - @echo "... src/antlr3tokenstream.o" - @echo "... src/antlr3tokenstream.i" - @echo "... src/antlr3tokenstream.s" - @echo "... src/antlr3treeparser.o" - @echo "... src/antlr3treeparser.i" - @echo "... src/antlr3treeparser.s" -.PHONY : help - - - -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -.PHONY : cmake_check_build_system - Modified: branches/tora3/extlibs/libermodel/CMakeLists.txt =================================================================== --- branches/tora3/extlibs/libermodel/CMakeLists.txt 2012-09-12 09:52:17 UTC (rev 4463) +++ branches/tora3/extlibs/libermodel/CMakeLists.txt 2012-09-12 09:55:04 UTC (rev 4464) @@ -34,6 +34,10 @@ QT4_WRAP_CPP(ERMODEL_MOC_SOURCES ${ERMODEL_MOC_CLASSES}) -INCLUDE_DIRECTORIES(${graphviz_INCLUDE_DIRECTORIES}) +INCLUDE_DIRECTORIES( + ${graphviz_INCLUDE_DIRECTORIES} + ${Boost_INCLUDE_DIRS} +) + ADD_LIBRARY(ermodel STATIC ${ERMODEL_SRCS} ${ERMODEL_MOC_SOURCES}) TARGET_LINK_LIBRARIES(ermodel ${graphviz_LIBRARIES} ${QT_LIBRARIES}) Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-09-12 09:52:17 UTC (rev 4463) +++ branches/tora3/src/CMakeLists.txt 2012-09-12 09:55:04 UTC (rev 4464) @@ -360,7 +360,7 @@ # sources SET(TORA_SOURCES - stdafx.cpp # NOTE(MSVC) the there is NO way how to force /Yc option fot this file only + stdafx.cpp # NOTE(MSVC) the there is NO way how to force /Yc option for this file only core/toabout.cpp core/tobackground.cpp core/tobackgroundlabel.cpp @@ -520,8 +520,6 @@ tools/tosecuritytreemodel.cpp tools/tosecuritytreeitem.cpp - - # totemplateprovider.cpp # #tosqlparsetest.cpp # toalert.cpp @@ -804,7 +802,7 @@ INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/i18n) -elseif (UNIX) +ELSEIF (UNIX) # Unix install install(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX}) install(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora/i18n) Modified: branches/tora3/src/windows/CMakeLists.txt =================================================================== --- branches/tora3/src/windows/CMakeLists.txt 2012-09-12 09:52:17 UTC (rev 4463) +++ branches/tora3/src/windows/CMakeLists.txt 2012-09-12 09:55:04 UTC (rev 4464) @@ -6,8 +6,8 @@ # ) SET(WINDOWS_LIB_SOURCES +dummy.cpp resource.h - tora.ico tora.rc ) Deleted: branches/tora3/src/windows/Makefile =================================================================== --- branches/tora3/src/windows/Makefile 2012-09-12 09:52:17 UTC (rev 4463) +++ branches/tora3/src/windows/Makefile 2012-09-12 09:55:04 UTC (rev 4464) @@ -1,117 +0,0 @@ - - -# BEGIN_COMMON_COPYRIGHT_HEADER -# -# TOra - An Oracle Toolkit for DBA's and developers -# -# Shared/mixed copyright is held throughout files in this product -# -# Portions Copyright (C) 2000-2001 Underscore AB -# Portions Copyright (C) 2003-2005 Quest Software, Inc. -# Portions Copyright (C) 2004-2009 Numerous Other Contributors -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; only version 2 of -# the License is valid for this program. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception, you have permission to link this program -# with the Oracle Client libraries and distribute executables, as long -# as you follow the requirements of the GNU GPL in regard to all of the -# software in the executable aside from Oracle client libraries. -# -# Specifically you are not permitted to link this program with the -# Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. -# And you are not permitted to distribute binaries compiled against -# these libraries. -# -# You may link this product with any GPL'd Qt library. -# -# All trademarks belong to their respective owners. -# -# END_COMMON_COPYRIGHT_HEADER - -# This script only compiles the resources and windows classes in this directory - -# C++ Compiler to use -GCC=g++ - -# Windows resource compiler -RC=windres - -# Additional defines -DEFINES=-D_WIN32 - -# Additional includes needed to compile program -INCLUDES= - -# Comment out this line if you want more output from compile -.SILENT: - -# Additional flags set when using only the precompiler. -CPPFLAGS_GLOB= - -# Additional flags set when compiling. -CFLAGS_GLOB=-g -O3 -W -Wall -c -w -fno-rtti - -############################################################################ -# -# End of configuration part of Makefile -# -############################################################################ - -SOURCES=\ - cregistry.cpp - -RESOURCES=\ - tora.rc - - -default: all - - -CPPFLAGS=$(CPPFLAGS_GLOB) $(DEFINES) $(INCLUDES) -CFLAGS=$(CFLAGS_GLOB) $(INCLUDES) $(DEFINES) - -OBJECTS=$(filter %.o,$(SOURCES:%.cpp=%.o)) $(filter %.o,$(RESOURCES:%.rc=%.o)) - -DEPENDS=$(filter %.d,$(SOURCES:%.cpp=.depends/%.d)) - -vpath %.h $(INCLUDE) - -.PHONY: all clean - -all: $(OBJECTS) - -%.moc: %.h - @echo Metacompiling $< - $(MOC) -o $@ $< - -%.o: %.rc - @echo Compiling resources $< - $(RC) -o $@ $< - -%.o: %.cpp - @echo Compiling $< - $(GCC) $(CFLAGS) -o $@ -c $< - -include $(DEPENDS) - -.depends/%.d: %.cpp - @echo Making dependencies for $< - if [ ! -d .depends ] ; then mkdir -p .depends ; fi - $(GCC) -MM -MG $(CPPFLAGS) $< > $@.tmp && \ - ( sed "s/^\(.*\.\)o\([ :]*\)/\1o \ - $(subst /,\\/,$@)\2/g" < $@.tmp > $@ ; rm -f $@.tmp ) -clean: - @echo Cleaning $(TITLE) - -rm -rf *.o This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-09-20 22:08:31
|
Revision: 4470 http://tora.svn.sourceforge.net/tora/?rev=4470&view=rev Author: ibre5041 Date: 2012-09-20 22:08:24 +0000 (Thu, 20 Sep 2012) Log Message: ----------- Fscking QMdiArea does something different than plssing off. See test3.cpp Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/src/CMakeLists.txt branches/tora3/src/core/toconfiguration.cpp branches/tora3/src/core/toconfiguration.h branches/tora3/src/core/tomain.h branches/tora3/src/core/tomainwindow.h Added Paths: ----------- branches/tora3/src/icons.qrc branches/tora3/src/images/ branches/tora3/src/images/copy.png branches/tora3/src/images/cut.png branches/tora3/src/images/new.png branches/tora3/src/images/open.png branches/tora3/src/images/paste.png branches/tora3/src/images/save.png branches/tora3/src/tests/test3.cpp branches/tora3/src/tests/test3.h Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-09-17 20:17:46 UTC (rev 4469) +++ branches/tora3/CMakeLists.txt 2012-09-20 22:08:24 UTC (rev 4470) @@ -17,7 +17,6 @@ #Require 2.8 for svnversion CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) - #Pretty colors SET(CMAKE_COLOR_MAKEFILE ON) #Dont force verbose @@ -76,17 +75,21 @@ ########## check for the CPU we build for ########## IF (CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -ggdb3") SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic") SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -rdynamic -ggdb3") - ENDIF (CMAKE_COMPILER_IS_GNUCC) +# # Set a default build type if none was specified +# IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to 'Debug' as none was specified.") +# set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE) +# # Set the possible values of build type for cmake-gui + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +# ENDIF() #Convert our simpler command line option to the CMake style #None, Debug, Release, .. or custom ones - if (CMAKE_BUILD_TYPE MATCHES [Dd]ebug) message(STATUS "Debug build") set(CMAKE_BUILD_TYPE Debug) Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-09-17 20:17:46 UTC (rev 4469) +++ branches/tora3/src/CMakeLists.txt 2012-09-20 22:08:24 UTC (rev 4470) @@ -67,7 +67,7 @@ ) SET (TORA_I18N_TS_TOAD i18n/tora_toad.ts) -SET(TORA_RCC_FILES tora.qrc) +SET(TORA_RCC_FILES tora.qrc icons.qrc) SET(TORA_UI_SRC core/toaboutui.ui @@ -269,6 +269,8 @@ tools/tocurrent.h + tests/test3.h + # toalert.h # # tobrowserschemabasewidget.h @@ -710,7 +712,7 @@ # ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) ENDIF(USE_PCH) -if (0) +if(0) # test1 ADD_EXECUTABLE("test1" ${GUI_TYPE} tests/test1.cpp @@ -740,8 +742,23 @@ SET_TARGET_PROPERTIES("test2" PROPERTIES ENABLE_EXPORTS ON) # explicitly say that the executable depends on the svnheader ADD_DEPENDENCIES("test2" revisiontag) -endif(0) +# test3 +ADD_EXECUTABLE("test3" ${GUI_TYPE} + tests/test3.cpp + ${TORA_UI_SOURCES} + ${TORA_I18N_QM} + ${TORA_MOC_SOURCES} + ${TORA_SOURCES} + ${TORA_RCC_SRCS} + ${APPLE_BUNDLE_SOURCES} + ) +TARGET_LINK_LIBRARIES("test3" ${TORA_LIBS}) +SET_TARGET_PROPERTIES("test3" PROPERTIES ENABLE_EXPORTS ON) +# explicitly say that the executable depends on the svnheader +ADD_DEPENDENCIES("test3" revisiontag) +endif() + IF(USE_PCH) IF(CMAKE_GENERATOR MATCHES Visual*) # ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" ${EXE_NAME}) Modified: branches/tora3/src/core/toconfiguration.cpp =================================================================== --- branches/tora3/src/core/toconfiguration.cpp 2012-09-17 20:17:46 UTC (rev 4469) +++ branches/tora3/src/core/toconfiguration.cpp 2012-09-20 22:08:24 UTC (rev 4470) @@ -1011,11 +1011,14 @@ p->m_syntaxStaticBg = v.name(); } -QString toConfiguration::provider() +QString toConfiguration::defaultProvider() { return p->m_provider; } -// void setProvider(const QString & v) { p->m_provider = v; } +void toConfiguration::setDefaultProvider(const QString & v) +{ + p->m_provider = v; +} bool toConfiguration::savePassword() { Modified: branches/tora3/src/core/toconfiguration.h =================================================================== --- branches/tora3/src/core/toconfiguration.h 2012-09-17 20:17:46 UTC (rev 4469) +++ branches/tora3/src/core/toconfiguration.h 2012-09-20 22:08:24 UTC (rev 4470) @@ -71,8 +71,8 @@ */ bool saveMap(const QString &file, std::map<QString, QString> &pairs); - QString provider(); -// void setProvider(const QString & v) { m_provider = v; }; + QString defaultProvider(); + void setDefaultProvider(const QString & v); bool savePassword(); void setSavePassword(bool v); Modified: branches/tora3/src/core/tomain.h =================================================================== --- branches/tora3/src/core/tomain.h 2012-09-17 20:17:46 UTC (rev 4469) +++ branches/tora3/src/core/tomain.h 2012-09-20 22:08:24 UTC (rev 4470) @@ -108,7 +108,7 @@ * Get the workspace widget of the main window. * @return Workspace widget. */ - virtual QMdiArea *workspace() const + virtual QMdiArea *workspace() { return Workspace; } Modified: branches/tora3/src/core/tomainwindow.h =================================================================== --- branches/tora3/src/core/tomainwindow.h 2012-09-17 20:17:46 UTC (rev 4469) +++ branches/tora3/src/core/tomainwindow.h 2012-09-20 22:08:24 UTC (rev 4470) @@ -82,7 +82,7 @@ * Get the workspace widget of the main window. * @return Workspace widget. */ - virtual QMdiArea *workspace() const = 0; + virtual QMdiArea *workspace() = 0; virtual toSearchReplace* searchDialog() = 0; Added: branches/tora3/src/icons.qrc =================================================================== --- branches/tora3/src/icons.qrc (rev 0) +++ branches/tora3/src/icons.qrc 2012-09-20 22:08:24 UTC (rev 4470) @@ -0,0 +1,10 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>images/copy.png</file> + <file>images/cut.png</file> + <file>images/new.png</file> + <file>images/open.png</file> + <file>images/paste.png</file> + <file>images/save.png</file> +</qresource> +</RCC> Added: branches/tora3/src/images/copy.png =================================================================== (Binary files differ) Property changes on: branches/tora3/src/images/copy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/tora3/src/images/cut.png =================================================================== (Binary files differ) Property changes on: branches/tora3/src/images/cut.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/tora3/src/images/new.png =================================================================== (Binary files differ) Property changes on: branches/tora3/src/images/new.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/tora3/src/images/open.png =================================================================== (Binary files differ) Property changes on: branches/tora3/src/images/open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/tora3/src/images/paste.png =================================================================== (Binary files differ) Property changes on: branches/tora3/src/images/paste.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/tora3/src/images/save.png =================================================================== (Binary files differ) Property changes on: branches/tora3/src/images/save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/tora3/src/tests/test3.cpp =================================================================== --- branches/tora3/src/tests/test3.cpp (rev 0) +++ branches/tora3/src/tests/test3.cpp 2012-09-20 22:08:24 UTC (rev 4470) @@ -0,0 +1,494 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2009 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "tests/test3.h" + +#include "core/tosplash.h" + +#include "core/utils.h" +#include "core/tologger.h" +#include "core/toabout.h" +#include "core/toconf.h" +#include "core/toconfiguration.h" +#include "core/toconnection.h" +#include "core/todocklet.h" + +#include "core/toconnection.h" +#include "core/toraversion.h" +#include "core/toconnectionprovider.h" +#include "core/tooracleconst.h" + +#include "tools/toworksheet.h" + +#include <QStatusBar> +#include <QScrollArea> +#include <QSplitter> +#include <QDir> +#include <QLibrary> + +toConnection *oraCon = NULL; + +Test3Window::Test3Window(QString user, QString password, QString connect, QSet<QString>& options): toMainWindow() +{ + oraCon = new toConnection( + QString("Oracle"), + user, + password, + "", + connect, + "", + "", + options); + TLOG(0,toDecorator,__HERE__) << "Version: " + << oraCon->version().toUtf8().constData() + << std::endl; + addConnection(oraCon); + { + QSplitter *splitter; + + splitter = new QSplitter(this); + splitter->setOrientation(Qt::Horizontal); + + Workspace = new QMdiArea(splitter); + Workspace->setActivationOrder(QMdiArea::CreationOrder); + Workspace->setViewMode(QMdiArea::TabbedView); + + toWorksheet *w1 = new toWorksheet(this, *oraCon); + toWorksheet *w2 = new toWorksheet(this, *oraCon); + //MdiChild *mc1 = new MdiChild; + //MdiChild *mc2 = new MdiChild; + //Workspace->addSubWindow(mc1); + //Workspace->addSubWindow(mc2); + Workspace->addSubWindow(w1); + Workspace->addSubWindow(w2); + + splitter->addWidget(this->Workspace); + + m_describeAction = new QAction("&Describe", this); + + ///createDocklets(); // Must be called after Wokspace is initialized + + this->setCentralWidget(splitter); + + //statusbar = new QStatusBar(this); + //this->setStatusBar(statusbar); + + createActions(); + createMenus(); + createToolBars(); + createStatusBar(); + } + + show(); + + ///createDockbars(); + + // for (ToolsRegistrySing::ObjectType::iterator i = ToolsRegistrySing::Instance().begin(); + // i != ToolsRegistrySing::Instance().end(); + // ++i) + // { + // if(i.value()->name() == "SQL Editor") + // //if(i.value()->name() == "Security Manager") + // //if(i.value()->name() == "Schema Browser") + // { + // i.value()->customSetup(); + // i.value()->createWindow(); + // } + // } +} + +void Test3Window::createDocklets() +{ + foreach(toDocklet *let, toDocklet::docklets()) + addDockWidget(Qt::LeftDockWidgetArea, let); +} +void Test3Window::moveDocklet(toDocklet *let, Qt::DockWidgetArea area) +{ + if(area == Qt::RightDockWidgetArea) + { + leftDockbar->removeDocklet(let); + rightDockbar->addDocklet(let); + } + + if(area == Qt::LeftDockWidgetArea) + { + rightDockbar->removeDocklet(let); + leftDockbar->addDocklet(let); + } +} +toDockbar* Test3Window::dockbar(toDocklet *let) +{ + if(rightDockbar->contains(let)) + return rightDockbar; + return leftDockbar; +} +void Test3Window::createDockbars() +{ + leftDockbar = new toDockbar(Qt::LeftToolBarArea, + tr("Left Dockbar"), + this); + addToolBar(Qt::LeftToolBarArea, leftDockbar); + leftDockbar->hide(); + + rightDockbar = new toDockbar(Qt::RightToolBarArea, + tr("Right Dockbar"), + this); + addToolBar(Qt::RightToolBarArea, rightDockbar); + rightDockbar->hide(); + + // toDockbar keeps it's own settings, but just in case something + // goes wrong, or a new setup, add any visible docklets to the + // dockbar. + + foreach(toDocklet *let, toDocklet::docklets()) + { + if(let->isVisible()) + moveDocklet(let, dockWidgetArea(let)); + + connect(let, + SIGNAL(dockletLocationChanged(toDocklet *, Qt::DockWidgetArea)), + this, + SLOT(moveDocklet(toDocklet *, Qt::DockWidgetArea))); + } + + leftDockbar->restoreState(toConfigurationSingle::Instance().leftDockbarState()); + rightDockbar->restoreState(toConfigurationSingle::Instance().rightDockbarState()); +} + +void Test3Window::createActions() +{ + newAct = new QAction(QIcon(":/images/new.png"), tr("&New"), this); + newAct->setShortcuts(QKeySequence::New); + newAct->setStatusTip(tr("Create a new file")); + connect(newAct, SIGNAL(triggered()), this, SLOT(newFile())); + + openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this); + openAct->setShortcuts(QKeySequence::Open); + openAct->setStatusTip(tr("Open an existing file")); + // connect(openAct, SIGNAL(triggered()), this, SLOT(open())); + + saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save"), this); + saveAct->setShortcuts(QKeySequence::Save); + saveAct->setStatusTip(tr("Save the document to disk")); + // connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); + + saveAsAct = new QAction(tr("Save &As..."), this); + saveAsAct->setShortcuts(QKeySequence::SaveAs); + saveAsAct->setStatusTip(tr("Save the document under a new name")); + // connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs())); + +//! [0] + exitAct = new QAction(tr("E&xit"), this); + exitAct->setShortcuts(QKeySequence::Quit); + exitAct->setStatusTip(tr("Exit the application")); + connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows())); +//! [0] + + cutAct = new QAction(QIcon(":/images/cut.png"), tr("Cu&t"), this); + cutAct->setShortcuts(QKeySequence::Cut); + cutAct->setStatusTip(tr("Cut the current selection's contents to the " + "clipboard")); + // connect(cutAct, SIGNAL(triggered()), this, SLOT(cut())); + + copyAct = new QAction(QIcon(":/images/copy.png"), tr("&Copy"), this); + copyAct->setShortcuts(QKeySequence::Copy); + copyAct->setStatusTip(tr("Copy the current selection's contents to the " + "clipboard")); + // connect(copyAct, SIGNAL(triggered()), this, SLOT(copy())); + + pasteAct = new QAction(QIcon(":/images/paste.png"), tr("&Paste"), this); + pasteAct->setShortcuts(QKeySequence::Paste); + pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current " + "selection")); + // connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste())); + + closeAct = new QAction(tr("Cl&ose"), this); + closeAct->setStatusTip(tr("Close the active window")); + connect(closeAct, SIGNAL(triggered()), + Workspace, SLOT(closeActiveSubWindow())); + + closeAllAct = new QAction(tr("Close &All"), this); + closeAllAct->setStatusTip(tr("Close all the windows")); + connect(closeAllAct, SIGNAL(triggered()), + Workspace, SLOT(closeAllSubWindows())); + + tileAct = new QAction(tr("&Tile"), this); + tileAct->setStatusTip(tr("Tile the windows")); + connect(tileAct, SIGNAL(triggered()), Workspace, SLOT(tileSubWindows())); + + cascadeAct = new QAction(tr("&Cascade"), this); + cascadeAct->setStatusTip(tr("Cascade the windows")); + connect(cascadeAct, SIGNAL(triggered()), Workspace, SLOT(cascadeSubWindows())); + + nextAct = new QAction(tr("Ne&xt"), this); + nextAct->setShortcuts(QKeySequence::NextChild); + nextAct->setStatusTip(tr("Move the focus to the next window")); + connect(nextAct, SIGNAL(triggered()), + Workspace, SLOT(activateNextSubWindow())); + + previousAct = new QAction(tr("Pre&vious"), this); + previousAct->setShortcuts(QKeySequence::PreviousChild); + previousAct->setStatusTip(tr("Move the focus to the previous " + "window")); + connect(previousAct, SIGNAL(triggered()), + Workspace, SLOT(activatePreviousSubWindow())); + + separatorAct = new QAction(this); + separatorAct->setSeparator(true); + + aboutAct = new QAction(tr("&About"), this); + aboutAct->setStatusTip(tr("Show the application's About box")); + connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); + + aboutQtAct = new QAction(tr("About &Qt"), this); + aboutQtAct->setStatusTip(tr("Show the Qt library's About box")); + connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); +} + +void Test3Window::createMenus() +{ + fileMenu = menuBar()->addMenu(tr("&File")); + fileMenu->addAction(newAct); + fileMenu->addAction(openAct); + fileMenu->addAction(saveAct); + fileMenu->addAction(saveAsAct); + fileMenu->addSeparator(); + QAction *action = fileMenu->addAction(tr("Switch layout direction")); + connect(action, SIGNAL(triggered()), this, SLOT(switchLayoutDirection())); + fileMenu->addAction(exitAct); + + editMenu = menuBar()->addMenu(tr("&Edit")); + editMenu->addAction(cutAct); + editMenu->addAction(copyAct); + editMenu->addAction(pasteAct); + + windowMenu = menuBar()->addMenu(tr("&Window")); + //updateWindowMenu(); + //connect(windowMenu, SIGNAL(aboutToShow()), this, SLOT(updateWindowMenu())); + + menuBar()->addSeparator(); + + helpMenu = menuBar()->addMenu(tr("&Help")); + helpMenu->addAction(aboutAct); + helpMenu->addAction(aboutQtAct); +} + +void Test3Window::createToolBars() +{ + fileToolBar = addToolBar(tr("File")); + fileToolBar->addAction(newAct); + fileToolBar->addAction(openAct); + fileToolBar->addAction(saveAct); + + editToolBar = addToolBar(tr("Edit")); + editToolBar->addAction(cutAct); + editToolBar->addAction(copyAct); + editToolBar->addAction(pasteAct); +} + +void Test3Window::createStatusBar() +{ + statusBar()->showMessage(tr("Ready")); +} + +void Test3Window::newFile() +{ + MdiChild *child = new MdiChild; + Workspace->addSubWindow(child); + + // child->newFile(); + child->show(); +} + +int main(int argc, char **argv) +{ + int p = 0; + + toConfiguration::setQSettingsEnv(); + + QApplication app(argc, argv); + + qRegisterMetaType<toQColumnDescriptionList>("toQColumnDescriptionList&"); + qRegisterMetaType<ValuesList>("ValuesList&"); + qRegisterMetaType<toConnection::exception>("toConnection::exception"); + + try { + toSplash splash(NULL); + splash.show(); + + QList<QString> plugins; + + // List of all connection provider finders + std::vector<std::string> finders = ConnectionProviderFinderFactory::Instance().keys(); + // Resulting list of all the providers found + toProvidersList &allProviders = toProvidersListSing::Instance(); + + QProgressBar *progress = splash.progress(); + QLabel *label = splash.label(); + progress->setRange(1, plugins.size() + finders.size()*2); + qApp->processEvents(); + Q_FOREACH(QString path, plugins) + { + label->setText(qApp->translate("main", "Loading plugin %1").arg(path)); + qApp->processEvents(); + bool success = false; + try { + QLibrary library(path); + success = library.load(); + } + TOCATCH; + + if (success) + { + label->setText(qApp->translate("main", "Loaded plugin %1").arg(path)); + TLOG(5, toDecoratorNC, __HERE__) << "Loaded plugin " << path << std::endl; + } else { + label->setText(qApp->translate("main", "Failed loading plugin %1").arg(path)); + TLOG(5, toDecoratorNC, __HERE__) << "Failed loading plugin " << path << std::endl; + } + progress->setValue(progress->value()+1); + qApp->processEvents(); + } + + // Loop over all finders and call their "find" method, each of them can return several locations + for(std::vector<std::string>::const_iterator i = finders.begin(); i != finders.end(); ++i) + { + QString finderName; + label->setText(qApp->translate("main", "Looking for %1").arg(finderName)); + qApp->processEvents(); + TLOG(5, toDecoratorNC, __HERE__) << "Looking for client: " << *i << std::endl; + try { + std::auto_ptr<toConnectionProviderFinder> finder = ConnectionProviderFinderFactory::Instance().create(*i, 0); + QList<toConnectionProviderFinder::ConnectionProvirerParams> l = finder->find(); + allProviders.append(l); + finderName = finder->name(); + } + TOCATCH; + progress->setValue(progress->value()+1); + qApp->processEvents(); + } + + // Loop over all providers found and try to load desired Oracle client + // 1st try to load requested Oracle client(if set) then load thick(TNS) Oracle client + QDir oHome = toConfigurationSingle::Instance().oracleHome(); + Q_FOREACH(toConnectionProviderFinder::ConnectionProvirerParams const& params, allProviders) + { + QString providerName = params.value("PROVIDER").toString(); + if( params.value("PROVIDER").toString() != ORACLE_PROVIDER) + continue; + QDir pHome(params.value("ORACLE_HOME").toString()); + if (oHome != pHome) + continue; + try { + label->setText(qApp->translate("main", "Loading provider %1").arg(providerName)); + qApp->processEvents(); + TLOG(5, toDecoratorNC, __HERE__) << "Loading: " << params.value("PATH").toString() << std::endl; + toConnectionProviderRegistrySing::Instance().load(params); + progress->setValue(progress->value()+1); + qApp->processEvents(); + break; + } + TOCATCH; + } + Q_FOREACH(toConnectionProviderFinder::ConnectionProvirerParams const& params, allProviders) + { + QString providerName = params.value("PROVIDER").toString(); + if( params.value("PROVIDER").toString() != ORACLE_PROVIDER) + continue; + if ( params.value("IS INSTANT").toBool() == true) + continue; + if ( toConnectionProviderRegistrySing::Instance().providers().contains(providerName)) + continue; + try { + label->setText(qApp->translate("main", "Loading provider %1").arg(providerName)); + qApp->processEvents(); + TLOG(5, toDecoratorNC, __HERE__) << "Loading: " << params.value("PATH").toString() << std::endl; + QString providerName = params.value("PROVIDER").toString(); + toConnectionProviderRegistrySing::Instance().load(params); + progress->setValue(progress->value()+1); + qApp->processEvents(); + break; + } TOCATCH; + } + // Load all remaning providers + Q_FOREACH(toConnectionProviderFinder::ConnectionProvirerParams provider, allProviders) + { + QString providerName = provider.value("PROVIDER").toString(); + if (toConnectionProviderRegistrySing::Instance().providers().contains(providerName)) + continue; + try { + label->setText(qApp->translate("main", "Loading provider %1").arg(providerName)); + qApp->processEvents(); + toConnectionProviderRegistrySing::Instance().load(provider); + progress->setValue(progress->value()+1); + qApp->processEvents(); + } + TOCATCH; + } + + } // end splash + catch (QString const& str) + { + fprintf(stderr, "Unhandled exception:\n\n%s\n", (const char *) str.toLatin1()); + TOMessageBox::critical(NULL, + qApp->translate("main", "Unhandled exception:"), + str, + qApp->translate("main", "Exit")); + } + catch (...) + { + fprintf(stderr, "Unhandled exception"); + TOMessageBox::critical(NULL, + qApp->translate("main", "Unhandled exception"), + "unknown", + qApp->translate("main", "Exit")); + } + + QString user = QString::fromAscii("system"); + QString password = QString::fromAscii("acror"); + QString connect = QString::fromAscii("XE"); + QSet<QString> options; + + new Test3Window(user, password, connect, options); + int ret = qApp->exec(); + return ret; +} + Added: branches/tora3/src/tests/test3.h =================================================================== --- branches/tora3/src/tests/test3.h (rev 0) +++ branches/tora3/src/tests/test3.h 2012-09-20 22:08:24 UTC (rev 4470) @@ -0,0 +1,169 @@ +#ifndef TROTL_TEST3_H +#define TROTL_TEST3_H + +#include "core/tomainwindow.h" +//#include "core/toworksheet.h" +#include "core/todockbar.h" +#include "core/tobackgroundlabel.h" + +#include <QObject> +#include <QMdiArea> +#include <QMdiSubWindow> +#include <QMenuBar> +#include <QSet> + +class Test3Window : public toMainWindow +{ + Q_OBJECT; + + void createActions(); + void createMenus(); + void createToolBars(); + void createStatusBar(); + QAction *newAct; + QAction *openAct; + QAction *saveAct; + QAction *saveAsAct; + QAction *exitAct; + QAction *cutAct; + QAction *copyAct; + QAction *pasteAct; + QAction *closeAct; + QAction *closeAllAct; + QAction *tileAct; + QAction *cascadeAct; + QAction *nextAct; + QAction *previousAct; + QAction *separatorAct; + QAction *aboutAct; + QAction *aboutQtAct; + QMenu *fileMenu; + QMenu *editMenu; + QMenu *windowMenu; + QMenu *helpMenu; + QToolBar *fileToolBar; + QToolBar *editToolBar; + void newFile(); + + QMdiArea *Workspace; + + toDockbar *leftDockbar,*rightDockbar; + + std::list<toConnection *> Connections; + + QAction * m_describeAction; +public: + Test3Window(QString, QString, QString, QSet<QString>&); + + void createDockbars(); + void createDocklets(); + void moveDocklet(toDocklet *let, Qt::DockWidgetArea area); + + // All the toMainWindow methods must be "reimplemented" somehow. + virtual QMdiArea* workspace() { return Workspace; }; + + virtual toSearchReplace* searchDialog() { return NULL; }; + + virtual QMdiSubWindow* lastActiveWindow() const { return NULL; }; + + virtual toBackgroundLabel* getBackgroundLabel() { return NULL; }; + + virtual void addChart(toLineChart*) {}; + virtual void removeChart(toLineChart*) {}; + virtual void setupChart(toLineChart*) {}; + + virtual void addRecentFile(const QString&) {}; + + virtual void addCustomMenu(QMenu *) {}; + + virtual toConnection* addConnection(toConnection *conn, bool def = true) + { + Connections.insert(Connections.end(), conn); + + checkCaching(); + + changeConnection(); + + return conn; + } + + virtual QList<toConnection*> const& connections(void) const + { + return QList<toConnection*>(); + }; + + virtual toConnection& connection(const QString &) + { + return *Connections.front(); + } + + virtual toConnection& currentConnection(void) + { + std::list<toConnection *>::iterator i = Connections.begin(); + if(i != Connections.end()) + return *(*i); + throw tr("Can't find active connection"); + } + + virtual void createDefault(void) {}; + + virtual void setCoordinates(int, int) {}; + + virtual void editOpenFile(QString file) {}; + + virtual void setNeedCommit(toConnection&, bool) {}; + + virtual void editSQL(const QString&) {}; + + virtual void registerSQLEditor(const QString&) {}; + + virtual void toolWidgetAdded(toToolWidget *tool) {}; + virtual void toolWidgetRemoved(toToolWidget*) {}; + + virtual toDockbar* dockbar(toDocklet *let); + +private slots: + void checkCaching(void) {}; + virtual void changeConnection() {}; + virtual void showMessage(const QString&, bool, bool) {}; + virtual void updateWindowsMenu() {}; + virtual void windowActivated(QMdiSubWindow*) {}; +}; + + +class MdiChild : public QTextEdit +{ + Q_OBJECT; +public: + + MdiChild() + { + setAttribute(Qt::WA_DeleteOnClose); + // isUntitled = true; + } + + // void newFile(); + // bool loadFile(const QString &fileName); + // bool save(); + // bool saveAs(); + // bool saveFile(const QString &fileName); + // QString userFriendlyCurrentFile(); + // QString currentFile() { return curFile; } + +protected: + // void closeEvent(QCloseEvent *event); + +private slots: + // void documentWasModified(); + +private: + // bool maybeSave(); + // void setCurrentFile(const QString &fileName); + // QString strippedName(const QString &fullFileName); + + // QString curFile; + // bool isUntitled; +}; + +#endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-09-24 15:48:59
|
Revision: 4477 http://tora.svn.sourceforge.net/tora/?rev=4477&view=rev Author: ibre5041 Date: 2012-09-24 15:48:52 +0000 (Mon, 24 Sep 2012) Log Message: ----------- many cleanups Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/src/CMakeLists.txt branches/tora3/src/core/tologger.h branches/tora3/src/core/tomain.cpp branches/tora3/src/core/tomarkedtext.cpp branches/tora3/src/core/totool.cpp branches/tora3/src/core/totool.h branches/tora3/src/core/tsqlparse.h branches/tora3/src/docklets/toastwalk.cpp branches/tora3/src/docklets/tocodeoutline.cpp branches/tora3/src/docklets/toquerymodel.cpp branches/tora3/src/tools/toworksheet.cpp branches/tora3/src/tools/toworksheet.h branches/tora3/src/tools/toworksheetstatistic.cpp branches/tora3/src/tools/toworksheetstatistic.h Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/CMakeLists.txt 2012-09-24 15:48:52 UTC (rev 4477) @@ -30,7 +30,7 @@ # Check for SVN to include SVn revision in SVN based builds FIND_PACKAGE(Subversion) -IF (Subversion_FOUND) +IF (Subversion_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") # a custom target that is always built add_custom_target(revisiontag ALL) # creates svnheader.h using cmake script @@ -38,7 +38,7 @@ -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/getsvn.cmake) ADD_DEFINITIONS("-DHAVE_SVNREVISION_H=1") -ENDIF(Subversion_FOUND) +ENDIF() # Boost headers are required to compile with -DDEBUG (see tologger.h) and also for trotl sql parser FIND_PACKAGE(Boost REQUIRED) @@ -322,4 +322,3 @@ COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" ) ENDIF (WANT_RPM) - Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/CMakeLists.txt 2012-09-24 15:48:52 UTC (rev 4477) @@ -720,7 +720,7 @@ # ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) ENDIF(USE_PCH) -if(0) +if(1) # test1 ADD_EXECUTABLE("test1" ${GUI_TYPE} tests/test1.cpp @@ -737,19 +737,19 @@ ADD_DEPENDENCIES("test1" revisiontag) # test2 -ADD_EXECUTABLE("test2" ${GUI_TYPE} - tests/test2.cpp - ${TORA_UI_SOURCES} - ${TORA_I18N_QM} - ${TORA_MOC_SOURCES} - ${TORA_SOURCES} - ${TORA_RCC_SRCS} - ${APPLE_BUNDLE_SOURCES} - ) -TARGET_LINK_LIBRARIES("test2" ${TORA_LIBS}) -SET_TARGET_PROPERTIES("test2" PROPERTIES ENABLE_EXPORTS ON) -# explicitly say that the executable depends on the svnheader -ADD_DEPENDENCIES("test2" revisiontag) +# ADD_EXECUTABLE("test2" ${GUI_TYPE} +# tests/test2.cpp +# ${TORA_UI_SOURCES} +# ${TORA_I18N_QM} +# ${TORA_MOC_SOURCES} +# ${TORA_SOURCES} +# ${TORA_RCC_SRCS} +# ${APPLE_BUNDLE_SOURCES} +# ) +# TARGET_LINK_LIBRARIES("test2" ${TORA_LIBS}) +# SET_TARGET_PROPERTIES("test2" PROPERTIES ENABLE_EXPORTS ON) +# # explicitly say that the executable depends on the svnheader +# ADD_DEPENDENCIES("test2" revisiontag) # test3 ADD_EXECUTABLE("test3" ${GUI_TYPE} @@ -790,8 +790,7 @@ "connection/tooracleconnection.cpp" "connection/tooraclequery.cpp") TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} "trotl") - # TARGET_LINK_LIBRARIES(${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} test1 "trotl") - ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${EXE_NAME}) + ADD_DEPENDENCIES(${PROVIDER_ORACLE} ${TORA_LIB}) MESSAGE(STATUS "${PROVIDER_ORACLE} ${ORACLE_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB} trotl") ENDIF(ORACLE_FOUND) @@ -802,7 +801,7 @@ "connection/toteradataprovider.cpp" "connection/toteradatatraits.cpp") TARGET_LINK_LIBRARIES(${PROVIDER_TERADATA} ${TERADATA_LIBRARIES} ${QT_LIBRARIES} ${TORA_LIB}) - ADD_DEPENDENCIES(${PROVIDER_TERADATA} ${EXE_NAME}) + ADD_DEPENDENCIES(${PROVIDER_TERADATA} ${TORA_LIB}) ENDIF (TERADATA_FOUND) IF (WIN32) Modified: branches/tora3/src/core/tologger.h =================================================================== --- branches/tora3/src/core/tologger.h 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/core/tologger.h 2012-09-24 15:48:52 UTC (rev 4477) @@ -21,6 +21,7 @@ #include <QString> #include <boost/iostreams/device/null.hpp> #include <boost/iostreams/stream.hpp> +#include <boost/iostreams/stream_buffer.hpp> using namespace boost; using namespace boost::iostreams; Modified: branches/tora3/src/core/tomain.cpp =================================================================== --- branches/tora3/src/core/tomain.cpp 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/core/tomain.cpp 2012-09-24 15:48:52 UTC (rev 4477) @@ -329,7 +329,7 @@ printAct = new QAction(QPixmap(const_cast<const char**>(print_xpm)), tr("&Print..."), this); - saveAsAct->setShortcut(QKeySequence::Print); + printAct->setShortcut(QKeySequence::Print); quitAct = new QAction(tr("&Quit"), this); Modified: branches/tora3/src/core/tomarkedtext.cpp =================================================================== --- branches/tora3/src/core/tomarkedtext.cpp 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/core/tomarkedtext.cpp 2012-09-24 15:48:52 UTC (rev 4477) @@ -374,10 +374,17 @@ fsWatcherClear(); bool ret = false; - QFileInfo file(filename()); - QString fn = filename(); - if (askfile || fn.isEmpty()) - fn = Utils::toSaveFilename(file.dir().path(), QString::null, this); + QString fn; + QFileInfo file(filename()); + if(!filename().isEmpty() && file.exists() && file.isWritable()) + fn = file.absoluteFilePath(); + + if(!filename().isEmpty() && fn.isEmpty() && file.dir().exists()) + fn = file.absoluteFilePath(); + + if (askfile || fn.isEmpty()) + fn = Utils::toSaveFilename(fn, QString::null, this); + if (!fn.isEmpty() && Utils::toWriteFile(fn, text())) { toMainWidget()->addRecentFile(fn); @@ -385,10 +392,9 @@ setModified(false); emit fileSaved(fn); + m_fsWatcher->addPath(fn); ret = true; - } - - m_fsWatcher->addPath(fn); + } return ret; } Modified: branches/tora3/src/core/totool.cpp =================================================================== --- branches/tora3/src/core/totool.cpp 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/core/totool.cpp 2012-09-24 15:48:52 UTC (rev 4477) @@ -46,51 +46,17 @@ #include "core/totool.h" #include "core/utils.h" #include "core/tologger.h" -#include "core/tobackground.h" -#include "core/toconf.h" #include "core/toconnection.h" -#include "core/tomain.h" #include "core/toworkspace.h" -//#include <qapplication.h> -//#include <qfile.h> -//#include <qpixmap.h> -//#include <qregexp.h> -//#include <qstring.h> -//#include <qtimer.h> -#include <QMdiArea> -#include <QMdiSubWindow> -#include <QVBoxLayout> #include <QToolBar> #include <QMenu> +#include <QBoxLayout> -#ifndef Q_OS_WIN32 -#include <unistd.h> -#endif - // A little magic to get lrefresh to work and get a check on qApp - #undef QT_TRANSLATE_NOOP #define QT_TRANSLATE_NOOP(x,y) QTRANS(x,y) -// thx for Martin Pejcoch -// see QT JIRA bugs QTBUG-13515, QTBUG-18846, QTBUG-4982, QTBUG-19924, QTBUG-19957, QTBUG-2100 -// and all the QMdiArea related bugs -class MdiSubWindow : public QMdiSubWindow -{ -public: - MdiSubWindow( QWidget * parent = 0 , Qt::WindowFlags flags = 0) - : QMdiSubWindow( parent, flags ) - { - } - virtual void showEvent( QShowEvent * event ) - { - QMdiSubWindow::showEvent( event ); - if( widget() ) - widget()->show(); - } -}; - toConnectionWidget::toConnectionWidget(toConnection &conn, QWidget *widget) : Connection(&conn), Widget(widget) { @@ -337,7 +303,7 @@ return ButtonPicture; } -QWidget* toTool::createWindow() +toToolWidget* toTool::createWindow() { toToolWidget *newWin; try @@ -345,17 +311,9 @@ toMainWindow *main = toMainWidget(); toWorkSpace *ws = main->workspace(); - // for more information about this WOODOO see - // QT Jira BUG: QTBUG-13515, QTBUG-18846 and all the QMdiArea related bugs - ///QMdiArea *workspace = main->workspace(); - ///MdiSubWindow *newSub = new MdiSubWindow(workspace); - if (!canHandle(main->currentConnection())) throw QString("The tool %1 doesn't support the current database").arg(QString(name())); - // save previous window - // QMdiSubWindow *previous = main->lastActiveWindow(); - newWin = toolWindow(NULL, main->currentConnection()); ws->addToolWidget(newWin); // newWin->showMaximized(); @@ -371,44 +329,9 @@ // if (tool->windowTitle().isEmpty()) // tool->setCaption(name()); - - // const QPixmap *icon = toolbarImage(); - // if (icon) - // newSub->setWindowIcon(*icon); // main->toolWidgetAdded(tool); - // Maximize window if only window - // bool max = true; - // foreach(QMdiSubWindow * window, main->workspace()->subWindowList()) - // { - // QWidget *widget = window->widget(); - // if (widget && widget != newWin && !widget->isHidden()) - // max = false; - // } - - // if(!max && previous) - // { - // // if not max, check previous window. if it's - // // maximized then show this window max - // if(previous->windowState() & Qt::WindowMaximized) - // max = true; - // } - // - // if (max) - // newWin->showMaximized(); - - // workaround bug in mdi. deactivate subwindow first, then - // set active - // WARNING: don't change this call order unles you know what - // are you doing ;) It's working now. When there is missing - // "previous" call, the toWorksheet tool do not get focus. - // Dunno why... it makes me mad. - // main->workspace()->setActiveSubWindow(0); - // main->workspace()->setActiveSubWindow(previous); - // main->workspace()->setActiveSubWindow(newsub); - // workspace->setActiveSubWindow(newsub); - // piece of shit mdi doesn't always send window activated signal // main->windowActivated(newsub); Modified: branches/tora3/src/core/totool.h =================================================================== --- branches/tora3/src/core/totool.h 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/core/totool.h 2012-09-24 15:48:52 UTC (rev 4477) @@ -143,7 +143,7 @@ * * @return Name of tool. */ - QString name() const + QString const& name() const { return Name; } @@ -152,7 +152,7 @@ * * @return Name of tool. */ - QString key() const + QString const& key() const { return Key; } @@ -161,7 +161,7 @@ * * @return Priority of tool. */ - int priority() const + const int priority() const { return Priority; } @@ -317,7 +317,7 @@ * this tool. It calls the @ref toolWindow function to get widget and sets it * up properly. */ - QWidget* createWindow(void); + toToolWidget* createWindow(void); }; Modified: branches/tora3/src/core/tsqlparse.h =================================================================== --- branches/tora3/src/core/tsqlparse.h 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/core/tsqlparse.h 2012-09-24 15:48:52 UTC (rev 4477) @@ -552,6 +552,7 @@ public: enum StatementType { + S_NONE, S_SELECT, S_UPDATE, S_DELETE, @@ -574,6 +575,7 @@ Statement(const QString &statement, const QString &name) : _mStatement(statement) + , _mStatementType(S_NONE) , _mname(name) , _mState(P_INIT) , _mAST(NULL) Modified: branches/tora3/src/docklets/toastwalk.cpp =================================================================== --- branches/tora3/src/docklets/toastwalk.cpp 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/docklets/toastwalk.cpp 2012-09-24 15:48:52 UTC (rev 4477) @@ -1,7 +1,7 @@ -#include "toastwalk.h" -#include "../tologger.h" -#include "../ermodel/dotgraph.h" -#include "../parsing/tsqlparse.h" +#include "docklets/toastwalk.h" +#include "core/tologger.h" +#include "ermodel/dotgraph.h" +#include "core/tsqlparse.h" #define GLUE '_' Modified: branches/tora3/src/docklets/tocodeoutline.cpp =================================================================== --- branches/tora3/src/docklets/tocodeoutline.cpp 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/docklets/tocodeoutline.cpp 2012-09-24 15:48:52 UTC (rev 4477) @@ -39,11 +39,11 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include "utils.h" -#include "tocodeoutline.h" -#include "tologger.h" +#include "core/utils.h" +#include "docklets/tocodeoutline.h" +#include "core/tologger.h" -#include "parsing/tsqlparse.h" +#include "core/tsqlparse.h" //#include "tomain.h" //#include "toconnectionmodel.h" Modified: branches/tora3/src/docklets/toquerymodel.cpp =================================================================== --- branches/tora3/src/docklets/toquerymodel.cpp 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/docklets/toquerymodel.cpp 2012-09-24 15:48:52 UTC (rev 4477) @@ -53,8 +53,8 @@ #include <QTimerEvent> -#include "parsing/tsqlparse.h" -#include "toastwalk.h" +#include "core/tsqlparse.h" +#include "docklets/toastwalk.h" #include "ermodel/dotgraphview.h" #include "ermodel/dotgraph.h" Modified: branches/tora3/src/tools/toworksheet.cpp =================================================================== --- branches/tora3/src/tools/toworksheet.cpp 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/tools/toworksheet.cpp 2012-09-24 15:48:52 UTC (rev 4477) @@ -169,9 +169,9 @@ { return "SQL Editor"; } - virtual toToolWidget* toolWindow(QWidget *main, toConnection &connection) + virtual toToolWidget* toolWindow(QWidget *parent, toConnection &connection) { - return new toWorksheet(main, connection); + return new toWorksheet(parent, connection); } virtual QWidget *configurationTab(QWidget *parent) { @@ -1080,7 +1080,7 @@ { QString t = tr("Ignoring SQL*Plus command"); - Timer.start(); + Time.start(); slotAddLog(QueryString, toConnection::exception(t), false); Utils::toStatusMessage(t, true); return ; @@ -1107,7 +1107,7 @@ try { First = false; - Timer.start(); + Time.start(); //parser connection().parse(QueryString); } catch (const QString &exc) @@ -1120,7 +1120,7 @@ try { First = false; - Timer.start(); + Time.start(); QString buffer; if (!toConfigurationSingle::Instance().wsHistory()) { @@ -1167,7 +1167,7 @@ else { First = false; - Timer.start(); + Time.start(); stopAct->setEnabled(true); Poll.start(1000); Started->setToolTip(tr("Duration while query has been running\n\n") + QueryString); @@ -1274,8 +1274,8 @@ LastID++; int dur = 0; - if (!Timer.isNull()) - dur = Timer.elapsed(); + if (!Time.isNull()) + dur = Time.elapsed(); First = true; if (Logging) @@ -2166,7 +2166,7 @@ void toWorksheet::slotPoll(void) { - Started->setText(duration(Timer.elapsed(), false)); + Started->setText(duration(Time.elapsed(), false)); } void toWorksheet::slotSaveStatistics(void) @@ -2239,21 +2239,13 @@ toToolWidget::setCaption(name); } -toWorksheet *toWorksheet::fileWorksheet(const QString &file) +toToolWidget* toWorksheet::fileWorksheet(const QString &file) { - // QMdiSubWindow * w = new QMdiSubWindow(toMainWidget()->workspace()); + toWorksheet *worksheet = static_cast<toWorksheet*>(WorksheetTool.createWindow()); + worksheet->editor()->openFilename(file); + worksheet->slotSetCaption(); - // toWorksheet *worksheet = new toWorksheet(w, toMainWidget()->currentConnection(), false); - // worksheet->editor()->openFilename(file); - // worksheet->slotSetCaption(); - - // w->setAttribute(Qt::WA_DeleteOnClose); - // w->setWidget(worksheet); - // w->setWindowIcon(QIcon(*WorksheetTool.toolbarImage())); - // toMainWidget()->workspace()->addSubWindow(w); - // w->show(); - // toMainWidget()->updateWindowsMenu(); - // return worksheet; + return worksheet; } void toWorksheet::slotRefreshSetup(void) Modified: branches/tora3/src/tools/toworksheet.h =================================================================== --- branches/tora3/src/tools/toworksheet.h 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/tools/toworksheet.h 2012-09-24 15:48:52 UTC (rev 4477) @@ -124,7 +124,7 @@ toEditableMenu *InsertSavedMenu; bool First; - QTime Timer; + QTime Time; QTimer Poll; QWidget *Current; @@ -210,7 +210,7 @@ virtual void importData(std::map<QString, QString> &data, const QString &prefix); #endif - static toWorksheet *fileWorksheet(const QString &file); + static toToolWidget* fileWorksheet(const QString &file); signals: void executed(void); Modified: branches/tora3/src/tools/toworksheetstatistic.cpp =================================================================== --- branches/tora3/src/tools/toworksheetstatistic.cpp 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/tools/toworksheetstatistic.cpp 2012-09-24 15:48:52 UTC (rev 4477) @@ -203,12 +203,12 @@ QList<int> sizes; sizes << 1 << 1 << 1 << 1; cur.Charts->setSizes(sizes); - if (!cur.Plan->firstChild()) + if (cur.Plan && !cur.Plan->firstChild()) { delete cur.Plan; cur.Plan = NULL; } - else if (!ShowPlans->isChecked()) + else if (cur.Plan && !ShowPlans->isChecked()) cur.Plan->hide(); if (!ShowCharts->isChecked()) Modified: branches/tora3/src/tools/toworksheetstatistic.h =================================================================== --- branches/tora3/src/tools/toworksheetstatistic.h 2012-09-24 09:08:16 UTC (rev 4476) +++ branches/tora3/src/tools/toworksheetstatistic.h 2012-09-24 15:48:52 UTC (rev 4477) @@ -79,6 +79,11 @@ toBarChart *IO; #endif toListView *Plan; + data() + : Action(NULL) , Top(NULL), Label(NULL), Charts(NULL), Statistics(NULL), + // Wait(NULL), IO(NULL), + Plan(NULL) + {}; }; std::list<data> Open; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-09-24 19:46:41
|
Revision: 4478 http://tora.svn.sourceforge.net/tora/?rev=4478&view=rev Author: ibre5041 Date: 2012-09-24 19:46:32 +0000 (Mon, 24 Sep 2012) Log Message: ----------- build process cleanups Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/src/CMakeLists.txt branches/tora3/src/core/tosplash.h branches/tora3/src/tools/toworksheettext.h Added Paths: ----------- branches/tora3/src/obsolete/tofyracleconnection.cpp branches/tora3/src/obsolete/topassword.cpp branches/tora3/src/obsolete/tosmtp.cpp Removed Paths: ------------- branches/tora3/src/tofyracleconnection.cpp branches/tora3/src/topassword.cpp branches/tora3/src/tosmtp.cpp Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-09-24 15:48:52 UTC (rev 4477) +++ branches/tora3/CMakeLists.txt 2012-09-24 19:46:32 UTC (rev 4478) @@ -8,7 +8,7 @@ OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON) OPTION(ENABLE_TERADATA "Enable/Disable Teradata support." ON) OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" OFF) -OPTION(USE_PCH "Use percompiled headers" OFF) +OPTION(USE_PCH "Use percompiled headers" ON) OPTION(USE_EXPERIMENTAL "Use experimental code" ON) #Set our CMake minimum version @@ -41,11 +41,12 @@ ENDIF() # Boost headers are required to compile with -DDEBUG (see tologger.h) and also for trotl sql parser -FIND_PACKAGE(Boost REQUIRED) +# SET(Boost_DEBUG TRUE) +FIND_PACKAGE(Boost 1.46.0) IF (Boost_FOUND) MESSAGE(STATUS "Found Boost libraries for debug build: ${Boost_INCLUDE_DIRS}") ELSE (Boost_FOUND) - MESSAGE(FATAL "Boost libs not found. It's mandatory to build with debugging") + MESSAGE(FATAL "Boost libs not found.") ENDIF (Boost_FOUND) #Project Setup @@ -83,7 +84,7 @@ # # Set a default build type if none was specified # IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - message(STATUS "Setting build type to 'Debug' as none was specified.") +# message(STATUS "Setting build type to 'Debug' as none was specified.") # set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE) # # Set the possible values of build type for cmake-gui set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") @@ -94,10 +95,10 @@ message(STATUS "Debug build") set(CMAKE_BUILD_TYPE Debug) add_definitions(-DDEBUG) - set(TORA_DEBUG 1) + set(TORA_DEBUG TRUE) else() message(STATUS "non-debug build") - set(TORA_DEBUG 0) + set(TORA_DEBUG FALSE) add_definitions(-DNDEBUG) add_definitions(-DQT_NO_DEBUG_OUTPUT) endif() @@ -115,7 +116,7 @@ ENDIF (MSVC) -# Required for win wjen there is used an external qscintilla lib +# Required for win when there is used an external qscintilla lib IF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA) SET(CMAKE_CXX_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_CXX_FLAGS_RELEASE}") SET(CMAKE_C_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_C_FLAGS_RELEASE}") @@ -144,12 +145,11 @@ MESSAGE(FATAL_ERROR "No Qt4 found") ENDIF(QT_FOUND) - IF (WANT_INTERNAL_QSCINTILLA) MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") MESSAGE(STATUS "QSci: It's recomended to use external library for it") + ELSE (WANT_INTERNAL_QSCINTILLA) - FIND_PACKAGE(QScintilla REQUIRED) IF (QSCINTILLA_FOUND) MESSAGE("QScintilla2 Found OK") @@ -166,8 +166,8 @@ IF (NOT ENABLE_ORACLE) MESSAGE(STATUS "Oracle support is disabled by user choice") ADD_DEFINITIONS("-DTO_NO_ORACLE") + ELSE (NOT ENABLE_ORACLE) - FIND_PACKAGE(Oracle COMPONENTS CLNTSH XML) IF(ORACLE_FOUND) MESSAGE("Oracle OCI Library Found OK") @@ -183,8 +183,8 @@ IF (NOT ENABLE_PGSQL) MESSAGE(STATUS "PostgreSQL support is disabled by user choice") + ELSE (NOT ENABLE_PGSQL) - FIND_PACKAGE(PostgreSQL) IF (POSTGRESQL_FOUND) ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL) @@ -205,8 +205,8 @@ IF (NOT ENABLE_DB2) MESSAGE(STATUS "DB2 support is disabled by user choice") + ELSE (NOT ENABLE_DB2) - FIND_PACKAGE(DB2) IF (DB2_FOUND) ADD_DEFINITIONS(-DHAVE_DB2) @@ -233,9 +233,9 @@ ENDIF(USE_EXPERIMENTAL) -############################################################################################################## -########## Uninstall Setup ########## - +################################################################################ +########## Uninstall Setup ########## +################################################################################ CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" Modified: branches/tora3/src/CMakeLists.txt =================================================================== --- branches/tora3/src/CMakeLists.txt 2012-09-24 15:48:52 UTC (rev 4477) +++ branches/tora3/src/CMakeLists.txt 2012-09-24 19:46:32 UTC (rev 4478) @@ -1,15 +1,19 @@ INCLUDE(PCHSupport_26) -#Subdirectories +################################################################################ +# Subdirectories # +################################################################################ + # ADD_SUBDIRECTORY(i18n) IF (WIN32) ADD_SUBDIRECTORY(windows) - SET(TORA_LIB "tora") -ELSE (WIN32) - SET(TORA_LIB) ENDIF (WIN32) -# Headers +SET(TORA_LIB "tora") + +################################################################################ +# Headers # +################################################################################ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} @@ -58,6 +62,9 @@ ) ENDIF(graphviz_FOUND) +################################################################################ +# Resource files # +################################################################################ # only toad bindings are here. All others qm files will blow the binary too much SET (TORA_I18N_TS #i18n/tora_fr.ts @@ -69,6 +76,9 @@ SET(TORA_RCC_FILES tora.qrc icons.qrc) +################################################################################ +# User interface files # +################################################################################ SET(TORA_UI_SRC core/toaboutui.ui core/todatabasesettingui.ui @@ -113,7 +123,6 @@ # todebugchangeui.ui # todebugwatch.ui - # toeditextensionsetupui.ui # tochartalarmui.ui @@ -128,8 +137,6 @@ #totemplatesetupui.ui # totuningoverviewui.ui # totuningsettingui.ui - # # shortcuteditor - ) IF (ORACLE_FOUND) @@ -140,6 +147,9 @@ # LIST(APPEND TORA_UI_SRC pdfview/pdfviewwidget.ui) ENDIF (POPPLER_QT4_FOUND) +################################################################################ +# QObject sub-classes(moc) # +################################################################################ # MOC classses SET(TORA_MOC_CLASSES # Tora core sorces @@ -214,7 +224,9 @@ core/toresultlock.h core/toresultparam.h core/toresultlong.h - + core/tosplash.h + core/totimer.h + ts_log/toostream.h connection/toqmysqlsetting.h @@ -228,9 +240,12 @@ docklets/tologging.h tools/tooutput.h + tools/toworksheet.h tools/toworksheetwidget.h tools/toworksheetstatistic.h + tools/toworksheettext.h + tools/tosgatrace.h tools/tosgastatement.h #obsolete tools/tobrowserconstraint.h @@ -269,76 +284,44 @@ tools/tocurrent.h - tests/test3window.h - # toalert.h - # # tobrowserschemabasewidget.h - # # toconf.h - # # toconfiguration.h - - # toconnectionpool.h - - - # todebug.h # todebugtext.h - # # todefaultkeywords.h # toeditextensions.h - # # toeditwidget.h - # # toextract.h # tochartmanager.h - # tolegendchart.h - # # tolistviewformattercsv.h - # # tolistviewformatterfactory.h - # # tolistviewformatter.h - # # tolistviewformatterhtml.h - # # tolistviewformatteridentifier.h - # # tolistviewformattersql.h - # # tolistviewformattertabdel.h - # # tolistviewformattertext.h - # # tomainwindow.kde.h - # # tomysqlkeywords.h # toplsqleditor.h # toplsqltext.h # toprofiler.h # toproject.h - # # toqvalue.h - # # toreport.h + # # toreport.h # toresultlabel.h # toresultline.h - # toresultpie.h - # # toresultresources.h + # # toresultresources.h # torollback.h - # # toscheduler.h + # # toscheduler.h # toscript.h # toscriptschemawidget.h - # # toscripttreeitem.h + # # toscripttreeitem.h # toscripttreemodel.h - # tosmtp.h - # tosplash.h - # tosqledit.h - # # tosql.h - # # tosqlparse.h - # # tostoragedefinition.h + # tosqledit.h + # # tosql.h + # # tosqlparse.h + # # tostoragedefinition.h - # totemplate.h - # totemporary.h - # # totextview.h - # # totimer.h - # totuning.h + # totemplate.h + # totemporary.h + # # totextview.h - # # toworksheettext.h - # # shortcuteditor - + # totuning.h ) IF (ORACLE_FOUND) @@ -364,6 +347,9 @@ LIST(APPEND TORA_MOC_CLASSES tests/test3window.h) ENDIF() +################################################################################ +# Source files .cpp .rc # +################################################################################ # sources SET(TORA_SOURCES stdafx.cpp # NOTE(MSVC) the there is NO way how to force /Yc option for this file only @@ -528,53 +514,31 @@ tools/tosecuritytreeitem.cpp # totemplateprovider.cpp - # #tosqlparsetest.cpp # toalert.cpp - - # toconnectionpool.cpp - # todebug.cpp # todebugtext.cpp - # toeditextensions.cpp - # toextratranslations.cpp - - # # temporarily disabled due the lack of firebird here tofyracleconnection.cpp # tochartmanager.cpp - # tolegendchart.cpp - - # topassword.cpp - # toplsqleditor.cpp # toplsqltext.cpp # toprofiler.cpp # toproject.cpp - # toqsqlconnection.cpp # toreport.cpp - # toresultlabel.cpp # toresultline.cpp - - # toresultpie.cpp - # torollback.cpp - # # toscheduler.cpp + # toscheduler.cpp # toscript.cpp # toscriptschemawidget.cpp # toscripttreeitem.cpp # toscripttreemodel.cpp - - # tosmtp.cpp # tosqledit.cpp - # totemplate.cpp # totemporary.cpp # totextview.cpp # totuning.cpp - - # # # tooracletable.cpp ) @@ -605,9 +569,11 @@ LIST(APPEND TORA_SOURCES tests/test3window.cpp) ENDIF() -# compiled in icons for windows +################################################################################ +# compiled in icons for windows(MSVC and Mingw way) # +################################################################################ IF (WIN32 AND MSVC) - SET (TORA_SOURCES ${TORA_SOURCES} tora.rc) + LIST(APPEND TORA_SOURCES tora.rc) ENDIF (WIN32 AND MSVC) IF (WIN32 AND MINGW) # resource compilation for mingw @@ -615,7 +581,7 @@ COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/tora.rc -o ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) - SET(TORA_SOURCES ${TORA_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) + LIST(APPEND TORA_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/tora_rc.o) ENDIF (WIN32 AND MINGW) QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS} ${TORA_I18N_TS_TOAD}) @@ -623,14 +589,11 @@ QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES}) QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) -# IF (WIN32) -# LINK_DIRECTORIES(./windows) -# ENDIF (WIN32) +################################################################################ +# Libraries and library imports # +################################################################################ +ADD_DEFINITIONS("-DTSQLPARSER_DLL") -# IF (WANT_INTERNAL_QSCINTILLA) -# LINK_DIRECTORIES(./qscintilla2) -# ENDIF (WANT_INTERNAL_QSCINTILLA) - IF (WANT_INTERNAL_QSCINTILLA) SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) ENDIF (WANT_INTERNAL_QSCINTILLA) @@ -646,32 +609,20 @@ SET(APPLE_BUNDLE_SOURCES icons/tora.icns) ENDIF (APPLE) - IF(WIN32) IF (MSVC AND NOT TORA_DEBUG) # this is a must to switch off subsystem:console (console window poping up) # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified LINK_LIBRARIES(${QT_QTMAIN_LIBRARY}) SET (GUI_TYPE WIN32) - # IF (TORA_DEBUG) - # SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrtd.lib ${CMAKE_EXE_LINKER_FLAGS}") - # ELSE (TORA_DEBUG) - # SET (CMAKE_EXE_LINKER_FLAGS "/NODEFAULTLIB:msvcrt.lib ${CMAKE_EXE_LINKER_FLAGS}") - # ENDIF (TORA_DEBUG) ENDIF () ENDIF(WIN32) -ADD_DEFINITIONS("-DTSQLPARSER_DLL") - #Set up libraries to link with all found packages -# dynamic SET(TORA_LIBS - ${QT_LIBRARIES} - ${LIBXML2_LIBRARIES} - ${QSCINTILLA_LIBRARIES} - ${TORA_LOKI_LIB} #static - ## "parsing" - ## "antlr3c" + ${QT_LIBRARIES} # dynamic + ${QSCINTILLA_LIBRARIES} # dynamic + ${TORA_LOKI_LIB} # static ) IF (POPPLER_QT4_FOUND) @@ -686,6 +637,7 @@ IF (WANT_INTERNAL_QSCINTILLA) LIST(APPEND TORA_LIBS ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES}) ENDIF (WANT_INTERNAL_QSCINTILLA) + # prevent opening the cmd.exe window IF (WIN32) LIST(APPEND TORA_LIBS ${WINDOWS_LIB}) @@ -713,14 +665,9 @@ ) TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LIBS}) SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES ENABLE_EXPORTS ON) -# explicitly say that the executable depends on the svnheader -ADD_DEPENDENCIES(${EXE_NAME} revisiontag) +ADD_DEPENDENCIES(${EXE_NAME} revisiontag) # explicitly say that the executable depends on the svnheader -IF(USE_PCH) - # ADD_PRECOMPILED_HEADER(${EXE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h) -ENDIF(USE_PCH) - -if(1) +if(TORA_DEBUG) # test1 ADD_EXECUTABLE("test1" ${GUI_TYPE} tests/test1.cpp @@ -733,8 +680,7 @@ ) TARGET_LINK_LIBRARIES("test1" ${TORA_LIBS}) SET_TARGET_PROPERTIES("test1" PROPERTIES ENABLE_EXPORTS ON) -# explicitly say that the executable depends on the svnheader -ADD_DEPENDENCIES("test1" revisiontag) +ADD_DEPENDENCIES("test1" revisiontag) # explicitly say that the executable depends on the svnheader # test2 # ADD_EXECUTABLE("test2" ${GUI_TYPE} @@ -748,8 +694,7 @@ # ) # TARGET_LINK_LIBRARIES("test2" ${TORA_LIBS}) # SET_TARGET_PROPERTIES("test2" PROPERTIES ENABLE_EXPORTS ON) -# # explicitly say that the executable depends on the svnheader -# ADD_DEPENDENCIES("test2" revisiontag) +# ADD_DEPENDENCIES("test2" revisiontag) # explicitly say that the executable depends on the svnheader # test3 ADD_EXECUTABLE("test3" ${GUI_TYPE} @@ -763,14 +708,13 @@ ) TARGET_LINK_LIBRARIES("test3" ${TORA_LIBS}) SET_TARGET_PROPERTIES("test3" PROPERTIES ENABLE_EXPORTS ON) -# explicitly say that the executable depends on the svnheader -ADD_DEPENDENCIES("test3" revisiontag) +ADD_DEPENDENCIES("test3" revisiontag) # explicitly say that the executable depends on the svnheader endif() IF(USE_PCH) IF(CMAKE_GENERATOR MATCHES Visual*) # ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" ${EXE_NAME}) -# only one target can use precompiled headers on windows - cmake is insane +# only one target can use precompiled headers on windows - cmake is insane sometimes # ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test1") # ADD_MSVC_PRECOMPILED_HEADERS( "stdafx.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/precompiled.h" "test2") ELSE(CMAKE_GENERATOR MATCHES Visual*) @@ -779,7 +723,9 @@ ENDIF(CMAKE_GENERATOR MATCHES Visual*) ENDIF(USE_PCH) -# Connection provider libraries +################################################################################ +# Connection provider libraries # +################################################################################ # Oracle connection provider ADD_DEFINITIONS("-DTROTL_DLL") IF(ORACLE_FOUND) @@ -804,6 +750,9 @@ ADD_DEPENDENCIES(${PROVIDER_TERADATA} ${TORA_LIB}) ENDIF (TERADATA_FOUND) +################################################################################ +# Install # +################################################################################ IF (WIN32) # Windows install INSTALL(TARGETS ${EXE_NAME} ${PROVIDER_ORACLE} ${PROVIDER_TERADATA} RUNTIME DESTINATION bin LIBRARY DESTINATION bin) @@ -827,6 +776,7 @@ INSTALL(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/${EXE_NAME}.app/Contents/Resources/i18n) ELSEIF (UNIX) + # Unix install install(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX}) install(FILES ${TORA_I18N_QM} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/tora-${VERSION}/i18n) @@ -836,7 +786,6 @@ add_definitions(-DSHARE_DIR=\"${CMAKE_INSTALL_PREFIX}/share/tora-${VERSION}\") ENDIF() - #set (FILES_TO_TRANSLATE ${TORA_UI_SRC} ${TORA_SOURCES} ${TORA_MOC_CLASSES}) #qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TORA_I18N_TS}) #add_custom_command (lupdate DEPENDS ${QM_FILES} ) Modified: branches/tora3/src/core/tosplash.h =================================================================== --- branches/tora3/src/core/tosplash.h 2012-09-24 15:48:52 UTC (rev 4477) +++ branches/tora3/src/core/tosplash.h 2012-09-24 19:46:32 UTC (rev 4478) @@ -50,14 +50,15 @@ class toSplash : public QWidget { - QProgressBar *Progress; - QLabel *Label; - + Q_OBJECT; public: toSplash(QWidget *parent = 0); ~toSplash(); QLabel* label(void); QProgressBar* progress(void); +private: + QProgressBar *Progress; + QLabel *Label; }; inline QLabel* toSplash::label(void) Copied: branches/tora3/src/obsolete/tofyracleconnection.cpp (from rev 4477, branches/tora3/src/tofyracleconnection.cpp) =================================================================== --- branches/tora3/src/obsolete/tofyracleconnection.cpp (rev 0) +++ branches/tora3/src/obsolete/tofyracleconnection.cpp 2012-09-24 19:46:32 UTC (rev 4478) @@ -0,0 +1,864 @@ +//*************************************************************************** +/* +* TOra - An Oracle Toolkit for DBA's and developers +* Copyright (C) 2000-2001,2001 Underscore AB +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; only version 2 of +* the License is valid for this program. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +* As a special exception, you have permission to link this program +* with the Oracle Client libraries and distribute executables, as long +* as you follow the requirements of the GNU GPL in regard to all of the +* software in the executable aside from Oracle client libraries. +* +* Specifically you are not permitted to link this program with the +* Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. +* And you are not permitted to distribute binaries compiled against +* these libraries without written consent from Underscore AB. Observe +* that this does not disallow linking to the Qt Free Edition. +* +* All trademarks belong to their respective owners. +* +****************************************************************************/ + +#include <qfile.h> +#include <qregexp.h> +//Added by qt3to4: +#include <QString> + +#ifdef Q_OS_WIN32 +#include <winsock.h> +#endif + +#include "toconnection.h" +#include "toconf.h" +#include "totool.h" +#include "tosql.h" + +#include "ibase.h" + +static toSQL SQLListObjects("toOracleConnection:ListObjects", + "select \"RDB$OWNER_NAME\", \"RDB$RELATION_NAME\", \n" + "'TABLE', \"RDB$DESCRIPTION\" from \"RDB$RELATIONS\" ", + "List the objects to cache for a connection, should have same " + "columns and binds"); + +// +// Helper function to deal with named parameters ":name<type>" syntax +// + +static QString QueryParam(const QString &query, toQList ¶ms) +{ + QString ret; + bool inString = false; + toQList::iterator cpar = params.begin(); + + std::map<QString, QString> binds; + + for (unsigned int i = 0; i < query.length(); i++) + { + QChar c = query.at(i); + switch (char(c)) + { + case '\\': + ret += c; + ret += query.at(++i); + break; + case '\'': + inString = !inString; + ret += c; + break; + case ':': + if (!inString) + { + QString nam; + for (i++; i < query.length(); i++) + { + c = query.at(i); + if (!c.isLetterOrNumber()) + break; + nam += c; + } + QString in; + if (c == '<') + { + for (i++; i < query.length(); i++) + { + c = query.at(i); + if (c == '>') + { + i++; + break; + } + in += c; + } + } + i--; + + if (nam.isEmpty()) + throw QString("No bind name"); + + if (binds.find(nam) != binds.end()) + { + ret += binds[nam]; + break; + } + if (cpar == params.end()) + throw QString("Not all bind variables suplied"); + QString str; + if ((*cpar).isNull()) + { + str = "NULL"; + } + else if ((*cpar).isInt() || (*cpar).isDouble()) + { + str = QString(*cpar); + } + else + { + if (in != "noquote") + str += "'"; + QString tmp = (*cpar); + for (unsigned int j = 0; j < tmp.length(); j++) + { + QChar d = tmp.at(j); + switch (char(d)) + { + case 0: + str += "\\0"; + break; + case '\n': + str += "\\n"; + break; + case '\t': + str += "\\t"; + break; + case '\r': + str += "\\r"; + break; + case '\'': + str += "\\\'"; + break; + case '\"': + str += "\\\""; + break; + case '\\': + str += "\\\\"; + break; + default: + str += d; + } + } + if (in != "noquote") + str += "'"; + } + binds[nam] = str; + ret += str; + cpar++; + break; + } + default: + ret += c; + } + } + // More complex conversion here later + // printf("Parsed: %s\n",(const char *)ret); + return ret.toLatin1(); +} + +// +// Helper function to turn isc_status errors into exceptions +// + +static void ThrowException(long* isc_status) +{ + QString err; + char msg[512]; + + if ( !isc_status[1] ) + return; + + isc_interprete(msg, &isc_status); + err = msg; + msg[0] = '-'; + while ( isc_interprete(msg + 1, &isc_status) ) + { + err += "\n"; + err += msg; + } + + toConnection::exception ret = err; + throw ret; +} + +// +// Fyracle connection plugin +// + +class toFyracleProvider : public toConnectionProvider +{ + +public: + + class fyracleConnection; + + // + // fyracleSub holds the Fyracle-specific connection data + // + struct fyracleSub : public toConnectionSub + { + + isc_db_handle Connection; + isc_tr_handle Transaction; + + long isc_status[20]; + + fyracleSub(isc_db_handle connection) + { + Connection = connection; + } + }; + + static fyracleSub* fyracle(toConnectionSub* conn) + { + fyracleSub* fs; + fs = dynamic_cast<fyracleSub*>(conn); + if ( !fs ) + throw QString("Internal error mismatched connection"); + return fs; + } + + // + // fyracleQuery manages SQL statements + // + class fyracleQuery : public toQuery::queryImpl + { + + bool Cancel; + bool Running; + bool Eof; + long rows, curcol; + + fyracleSub *fs; + + isc_stmt_handle stmt; + XSQLDA* in_sqlda; // input parameter area + XSQLDA* out_sqlda; // result area + char* buf; // "autobind" data area + + public: + + fyracleQuery(toQuery *query, toConnectionSub *sub) + : toQuery::queryImpl(query) + { + Running = Cancel = false; + Eof = false; + buf = NULL; + rows = curcol = 0; + + fs = toFyracleProvider::fyracle(sub); + stmt = 0; + isc_dsql_allocate_statement(fs->isc_status, &fs->Connection, &stmt); + ThrowException(fs->isc_status); + + // allocate out & in xsqlda block with space for 20 sqlvar's + out_sqlda = (XSQLDA *) new char[(XSQLDA_LENGTH(20))]; + out_sqlda->sqln = 20; + out_sqlda->version = 1; + + in_sqlda = (XSQLDA *) new char[(XSQLDA_LENGTH(20))]; + in_sqlda->sqln = 20; + in_sqlda->version = 1; + } + + virtual ~fyracleQuery() + { + long isc_status[20]; + + isc_dsql_free_statement(isc_status, &stmt, DSQL_drop); + ThrowException(isc_status); + + delete (char*) out_sqlda; + delete (char*) in_sqlda; + delete buf; + } + + virtual void execute(void); + + void autobind(void); + + virtual toQValue readValue(void); + + virtual void cancel(void) + { + // Not implemented + } + + virtual bool eof(void) + { + return Eof; + } + + virtual int rowsProcessed(void) + { + return rows; + } + + virtual int columns(void) + { + return out_sqlda->sqld; + } + + virtual std::list<toQuery::queryDescribe> describe(void) + { + std::list<toQuery::queryDescribe> ret; + int descriptionLen = out_sqlda->sqld; + + for (int i = 0; i < descriptionLen; i++) + { + toQuery::queryDescribe desc; + XSQLVAR* var = &out_sqlda->sqlvar[i]; + + var->aliasname[var->aliasname_length] = 0; + desc.Name = QString::fromUtf8(var->aliasname); + if ( desc.Name.length() == 0 ) + { + var->sqlname[var->sqlname_length] = 0; + desc.Name = QString::fromUtf8(var->sqlname); + } + + int prec = 0; + switch (var->sqltype) + { + case SQL_VARYING: + case SQL_VARYING + 1: + desc.Datatype = "VARCHAR2"; + break; + case SQL_SHORT: + case SQL_SHORT + 1: + prec = 5; + desc.Datatype = "NUMBER"; + break; + case SQL_LONG: + case SQL_LONG + 1: + prec = 9; + desc.Datatype = "NUMBER"; + break; + case SQL_INT64: + case SQL_INT64 + 1: + prec = 18; + desc.Datatype = "NUMBER"; + break; + case SQL_DOUBLE: + case SQL_DOUBLE + 1: + desc.Datatype = "NUMBER"; + break; + case 11: + case 104: + desc.Datatype = "ROWID"; + break; + case SQL_TYPE_TIME: + case SQL_TYPE_TIME + 1: + case SQL_TYPE_DATE: + case SQL_TYPE_DATE + 1: + case SQL_TIMESTAMP: + case SQL_TIMESTAMP + 1: + desc.Datatype = "DATE"; + break; + case SQL_TEXT: + case SQL_TEXT + 1: + desc.Datatype = "CHAR"; + break; + case SQL_BLOB: + case SQL_BLOB + 1: + desc.Datatype = "BLOB"; + break; + } + + if (desc.Datatype == "NUMBER") + { + if (prec) + { + desc.Datatype.append(" ("); + desc.Datatype.append(QString::number(prec)); + if (var->sqlscale != 0) + { + desc.Datatype.append(","); + desc.Datatype.append(QString::number(-var->sqlscale)); + } + desc.Datatype.append(")"); + } + } + desc.Null = true; + + ret.insert(ret.end(), desc); + } + return ret; + } + }; + + // + // fyracleConnection manages a single attachment to the engine + // + class fyracleConnection : public toConnection::connectionImpl + { + + public: + fyracleConnection(toConnection *conn) + : toConnection::connectionImpl(conn) + { + } + + virtual std::list<toConnection::objectName> objectNames(void) + { + std::list<toConnection::objectName> ret; + + std::list<toQValue> par; + toQuery objects(connection(), toQuery::Long, SQLListObjects, par); + toConnection::objectName cur; + while (!objects.eof()) + { + cur.Owner = objects.readValueNull(); + cur.Name = objects.readValueNull(); + cur.Type = objects.readValueNull(); +// cur.Comment = objects.readValueNull(); + ret.insert(ret.end(), cur); + } + return ret; + } + + virtual toQDescList columnDesc(const toConnection::objectName &table) + { + try + { + QString SQL = "SELECT * FROM "; + SQL += table.Name; + SQL += " WHERE NULL=NULL"; + toQuery query(connection(), SQL); + return query.describe(); + } + catch (...) {} + + toQDescList ret; + return ret; + } + + virtual void commit(toConnectionSub *sub); + + virtual void rollback(toConnectionSub *sub); + + virtual toConnectionSub *createConnection(void); + + void closeConnection(toConnectionSub *conn); + + virtual QString version(toConnectionSub *sub) + { + return "Fyracle 0.8.0"; + } + + virtual toConnection::connectionImpl *clone(toConnection *newConn) const + { + return new fyracleConnection(newConn); + } + + virtual toQuery::queryImpl *createQuery(toQuery *query, toConnectionSub *sub) + { + return new fyracleQuery(query, sub); + } + + virtual void execute(toConnectionSub *sub, const QString &sql, toQList ¶ms) + { + } + }; + + toFyracleProvider(void) + : toConnectionProvider("Oracle") + {} + + virtual toConnection::connectionImpl *connection(toConnection *conn) + { + return new fyracleConnection(conn); + } + + virtual std::list<QString> modes(void) + { + std::list<QString> ret; + ret.insert(ret.end(), "Normal"); + return ret; + } + + virtual std::list<QString> hosts(void) + { + std::list<QString> ret; + ret.insert(ret.end(), "localhost"); + return ret; + } + + virtual std::list<QString> databases(const QString &host, const QString &user, const QString &pwd) + { + std::list<QString> ret; + return ret; + } + +}; + +// +// Connection management methods +// + +static const char tpb[] = // transaction parameter block +{ + 1, 9, 15, 6 +}; + +toConnectionSub *toFyracleProvider::fyracleConnection::createConnection(void) +{ + const char* usr = connection().user().data(); + const char* pwd = connection().password().data(); + + int usrlen = strlen(usr); + int pwdlen = strlen(pwd); + int dpblen = usrlen + pwdlen + 5; + int i; + + // allocate and fill database parameter block + char* dpb = new char[dpblen]; + dpb[0] = isc_dpb_version1; + dpb[1] = isc_dpb_user_name; + dpb[2] = usrlen; + for (i = 3; i < (usrlen + 3); i++) + dpb[i] = *usr++; + dpb[usrlen + 3] = isc_dpb_password; + dpb[usrlen + 4] = pwdlen; + for (i = usrlen + 5; i < (usrlen + pwdlen + 5); i++) + dpb[i] = *pwd++; + + // combine host and database path + QString path; + if ( connection().host().isEmpty() ) + { + path = connection().database().toUtf8(); + } + else + { + path = connection().host(); + path += ":"; + path += connection().database().toUtf8(); + } + + // attach to database + fyracleSub *fs = new fyracleSub(NULL); + + isc_attach_database (fs->isc_status, 0, path.data(), &fs->Connection, dpblen, dpb); + delete[] dpb; + ThrowException(fs->isc_status); + + fs->Transaction = NULL; + isc_start_transaction (fs->isc_status, &fs->Transaction, 1, &fs->Connection, sizeof(tpb), tpb); + ThrowException(fs->isc_status); + + return fs; +} + +void toFyracleProvider::fyracleConnection::commit(toConnectionSub *sub) +{ + fyracleSub *fs = toFyracleProvider::fyracle(sub); + + isc_commit_transaction(fs->isc_status, &fs->Transaction); + ThrowException(fs->isc_status); + fs->Transaction = NULL; + isc_start_transaction (fs->isc_status, &fs->Transaction, 1, &fs->Connection, sizeof(tpb), tpb); + ThrowException(fs->isc_status); +} + +void toFyracleProvider::fyracleConnection::rollback(toConnectionSub *sub) +{ + fyracleSub *fs = toFyracleProvider::fyracle(sub); + + isc_rollback_transaction(fs->isc_status, &fs->Transaction); + ThrowException(fs->isc_status); + fs->Transaction = NULL; + isc_start_transaction (fs->isc_status, &fs->Transaction, 1, &fs->Connection, sizeof(tpb), tpb); + ThrowException(fs->isc_status); +} + +void toFyracleProvider::fyracleConnection::closeConnection(toConnectionSub *sub) +{ + fyracleSub *fs = toFyracleProvider::fyracle(sub); + + isc_rollback_transaction(fs->isc_status, &fs->Transaction); + ThrowException(fs->isc_status); + + isc_detach_database(fs->isc_status, &fs->Connection); + ThrowException(fs->isc_status); + + delete sub; +} + +// +// Query management methods +// + +void toFyracleProvider::fyracleQuery::execute(void) +{ + // clear any pending queries + isc_dsql_free_statement(fs->isc_status, &stmt, DSQL_close); + if (Cancel) + throw QString("Query aborted before started"); + + Running = true; + QString sqlp = QueryParam(QString::fromUtf8(query()->sql()), + query()->params()); + char* sql = (char*) sqlp.data(); + isc_dsql_prepare(fs->isc_status, &fs->Transaction, &stmt, 0, sql, 3, out_sqlda); + ThrowException(fs->isc_status); + + // Bind output parameters + int out_cols = out_sqlda->sqld; + if ( out_sqlda->sqln < out_cols ) + { + // Need more room + delete (char*) out_sqlda; + out_sqlda = (XSQLDA *) new char[XSQLDA_LENGTH(out_cols)]; + out_sqlda->sqln = out_cols; + out_sqlda->version = 1; + + // repeat describe to capture all columns + isc_dsql_describe(fs->isc_status, &stmt, 1, out_sqlda); + ThrowException(fs->isc_status); + out_cols = out_sqlda->sqld; + } + + // Bind input parameters + isc_dsql_describe_bind(fs->isc_status, &stmt, 1, in_sqlda); + ThrowException(fs->isc_status); + + int in_cols = in_sqlda->sqld; + if ( in_sqlda->sqln < in_cols ) + { + // Need more room + delete (char*) in_sqlda; + in_sqlda = (XSQLDA *) new char[XSQLDA_LENGTH(in_cols)]; + in_sqlda->sqln = in_cols; + in_sqlda->version = 1; + + // repeat describe to capture all columns + isc_dsql_describe_bind(fs->isc_status, &stmt, 1, in_sqlda); + ThrowException(fs->isc_status); + in_cols = in_sqlda->sqld; + } + + /* + otl_null null; + for(toQList::iterator i=query()->params().begin();i!=query()->params().end();i++) { + if ((*i).isNull()) + (*Query)<<null; + else { + otl_var_desc *next=Query->describe_next_in_var(); + switch(next->ftype) { + case otl_var_double: + case otl_var_float: + (*Query)<<(*i).toDouble(); + break; + case otl_var_int: + case otl_var_unsigned_int: + case otl_var_short: + case otl_var_long_int: + (*Query)<<(*i).toInt(); + break; + default: + (*Query)<<QString(*i).toUtf8(); + break; + } + } + } + Running=false; + conn->Lock.up(); + */ + isc_dsql_execute(fs->isc_status, &fs->Transaction, &stmt, 1, in_sqlda); + ThrowException(fs->isc_status); + + Eof = false; + if ( out_sqlda->sqld > 0 ) + { + autobind(); + curcol = 0; + rows = 1; + + int rc = isc_dsql_fetch(fs->isc_status, &stmt, 1, out_sqlda); + if ( rc == 100 ) + Eof = true; + else + ThrowException(fs->isc_status); + } + else + Eof = true; +} + +toQValue toFyracleProvider::fyracleQuery::readValue(void) +{ + toQValue ret; + + if (eof()) + throw QString("Tried to read past end of query"); + + XSQLVAR* var = &out_sqlda->sqlvar[curcol]; + + curcol++; + + if ( *(var->sqlind) != -1 ) + { + + switch (var->sqltype) + { + case SQL_VARYING: + case SQL_VARYING + 1: + char* p; + int len; + p = (char*)(var->sqldata); + len = *(short*)p; + p += 2; + p[len] = 0; + ret = toQValue(p); + break; + + case SQL_SHORT: + case SQL_SHORT + 1: + int i; + i = *(short*)(var->sqldata); + ret = toQValue(i); + break; + + case SQL_LONG: + case SQL_LONG + 1: + long l; + l = *(long*)(var->sqldata); + ret = toQValue(l); + break; + + case SQL_INT64: + case SQL_INT64 + 1: + __int64 ll; + ll = *(__int64*)(var->sqldata); + l = ll; + ret = toQValue(l); + break; + + case SQL_DOUBLE: + case SQL_DOUBLE + 1: + double d; + d = *(double*)(var->sqldata); + ret = toQValue(d); + break; + + case SQL_TYPE_TIME: + case SQL_TYPE_TIME + 1: + case SQL_TYPE_DATE: + case SQL_TYPE_DATE + 1: + case SQL_TIMESTAMP: + case SQL_TIMESTAMP + 1: + throw QString("Internal error type mismatch in result set"); + break; + + case SQL_TEXT: + case SQL_TEXT + 1: + char* c; + c = (char*)(var->sqldata); + c[var->sqllen] = 0; + ret = toQValue(c); + break; + + case SQL_BLOB: + case SQL_BLOB + 1: + // TODO: fetch (text) BLOB here + l = *(long*)(var->sqldata); + ret = toQValue(l); + break; + } + } + + if (curcol == out_sqlda->sqld) + { + curcol = 0; + rows++; + int rc = isc_dsql_fetch(fs->isc_status, &stmt, 1, out_sqlda); + if ( rc == 100 ) + Eof = true; + else + ThrowException(fs->isc_status); + } + + return ret; +} + +#define ALIGN(n,b) ((n + b - 1) & ~(b - 1)) + +void toFyracleProvider::fyracleQuery::autobind() +{ + XSQLVAR *var; + int i, offset, length, alignment, type; + int colcount = out_sqlda->sqld; + + if ( !colcount ) return; + + // 'auto-bind' the result set columns (overwrites any existing bindings) + // compute the required size for 'buf' + for ( var = out_sqlda->sqlvar, offset = 0, i = 0; i < colcount; var++, i++) + { + length = alignment = var->sqllen; + type = var->sqltype & ~1; + + switch ( type ) + { + case SQL_TYPE_TIME: + case SQL_TYPE_DATE: + case SQL_TIMESTAMP: + type = SQL_TEXT; + default: + break; + } + + if ( type == SQL_TEXT ) + alignment = 1; + else if ( type == SQL_VARYING ) + { + // Allow space for vary's strlen & space to insert + // a null byte for printing + length += sizeof(short) + 1; + alignment = sizeof(short); + } + offset = ALIGN(offset, alignment); + var->sqldata = (char*) offset; + offset += length; + offset = ALIGN(offset, sizeof (short)); + var->sqlind = (short*) offset; + offset += sizeof(short); + } + // change VAR offsets into datapointers pointing into 'buf' + buf = new char[ offset ]; + for ( var = out_sqlda->sqlvar, i = 0; i < colcount; var++, i++) + { + var->sqldata = buf + (long) var->sqldata; + var->sqlind = (short*) (buf + (long) var->sqlind); + } +} + + +// +// Fyracle driver plugin instance +// + +static toFyracleProvider FyracleProvider; + + Copied: branches/tora3/src/obsolete/topassword.cpp (from rev 4477, branches/tora3/src/topassword.cpp) =================================================================== --- branches/tora3/src/obsolete/topassword.cpp (rev 0) +++ branches/tora3/src/obsolete/topassword.cpp 2012-09-24 19:46:32 UTC (rev 4478) @@ -0,0 +1,109 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2009 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "utils.h" + +#include "toconnection.h" +#include "tomain.h" +#include "tosql.h" +#include "totool.h" + +#include <qapplication.h> +#include <qinputdialog.h> +#include <qmessagebox.h> + +static toSQL SQLChangePassword("toPassword:ChangePassword", + "ALTER USER %1 IDENTIFIED BY \"%2\"", + "Change password of a user, must have same %"); + +class toPasswordTool : public toTool +{ +protected: +public: + toPasswordTool() + : toTool(599, "Password Change") + { } + virtual const char *menuItem() + { + return "Password Change"; + } + virtual QWidget *toolWindow(QWidget *, toConnection &connection) + { + QString np = QInputDialog::getText(toMainWidget(), + qApp->translate("toPasswordTool", "Enter new password"), + qApp->translate("toPasswordTool", "Enter new password"), + QLineEdit::Password, + QString::null, + NULL); + if (!np.isNull()) + { + QString np2 = QInputDialog::getText(toMainWidget(), + qApp->translate("toPasswordTool", "Enter new password again for confirmation"), + qApp->translate("toPasswordTool", "Enter new password again for confirmation"), + QLineEdit::Password, + QString::null, + NULL); + if (!np2.isNull()) + { + if (np != np2) + TOMessageBox::warning(toMainWidget(), + qApp->translate("toPasswordTool", "Passwords doesn't match"), + qApp->translate("toPasswordTool", "The two givens passwords doesn't match, please try again")); + else + { + try + { + connection.execute(toSQL::string(SQLChangePassword, connection). + arg(connection.user()).arg(np)); + } + catch (const QString &exc) + { + toStatusMessage(exc); + } + } + } + } + return NULL; + } + virtual void closeWindow(toConnection &connection) {}; +}; + +static toPasswordTool PasswordTool; Copied: branches/tora3/src/obsolete/tosmtp.cpp (from rev 4477, branches/tora3/src/tosmtp.cpp) =================================================================== --- branches/tora3/src/obsolete/tosmtp.cpp (rev 0) +++ branches/tora3/src/obsolete/tosmtp.cpp 2012-09-24 19:46:32 UTC (rev 4478) @@ -0,0 +1,166 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2009 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "utils.h" + +#include "tosmtp.h" +#include "toconf.h" +#include "toconfiguration.h" + +#include <qapplication.h> +#include <qmessagebox.h> +#include <qregexp.h> +#include <QTextStream> +#include <qtimer.h> + +#include <QTcpSocket> + + +toSMTP::toSMTP(const QString &from, + const QString &to, + const QString &subject, + const QString &body) +{ + From = from; + Recipient = to; + State = Init; + Stream = 0; + + Socket = new QTcpSocket(this); + connect(Socket, SIGNAL(readyRead()), + this, SLOT(readyRead())); + connect(Socket, SIGNAL(connected()), + this, SLOT(connected())); + + Message = QString::fromLatin1("From: ") + from + + QString::fromLatin1("\nTo: ") + to + + QString::fromLatin1("\nSubject: ") + subject + + QString::fromLatin1("\n\n") + body + "\n"; + Message.replace(QRegExp(QString::fromLatin1("\n")), + QString::fromLatin1("\r\n")); + Message.replace(QRegExp(QString::fromLatin1("\r\n.\r\n")), + QString::fromLatin1("\r\n..\r\n")); + + QString server(toConfigurationSingle::Instance().smtp()); + int port = toConfigurationSingle::Instance().smtpPort(); + + if (server.isNull() || server.isEmpty()) + toStatusMessage("No SMTP Server configured. Please check the preferences dialog."); + else + { + Socket->connectToHost(server, port); + Stream = new QTextStream(Socket); + } +} + +toSMTP::~toSMTP() +{ + delete Stream; + delete Socket; +} + +void toSMTP::connected() +{ + toStatusMessage(tr("Connected to %1").arg(Socket->peerName()), false, false); +} + +void toSMTP::readyRead() +{ + // SMTP is line-oriented + if (!Socket->canReadLine()) + return ; + + QString responseLine; + do + { + responseLine = Socket->readLine(); + Response += responseLine; + } + while (Socket->canReadLine() && responseLine[3] != ' '); + responseLine.truncate(3); + + if (State == Init && responseLine[0] == '2') + { + // banner was okay, let's go on + *Stream << "HELO there\r\n"; + State = Mail; + } + else if (State == Mail && responseLine[0] == '2') + { + // HELO response was okay (well, it has to be) + *Stream << "MAIL FROM: <" << From << ">\r\n"; + State = Rcpt; + } + else if (State == Rcpt && responseLine[0] == '2') + { + *Stream << "RCPT TO: <" << Recipient << ">\r\n"; + State = Data; + } + else if (State == Data && responseLine[0] == '2') + { + *Stream << "DATA\r\n"; + State = Body; + } + else if (State == Body && responseLine[0] == '3') + { + *Stream << Message << ".\r\n"; + State = Quit; + } + else if (State == Quit && responseLine[0] == '2') + { + *Stream << "QUIT\r\n"; + // here, we just close. + State = Close; + toStatusMessage(tr("Message sent"), false, false); + } + else if (State == Close) + { + delete this; + } + else + { + toStatusMessage(tr("Unexpected reply from SMTP server:\n\n") + + Response); + State = Close; + } + + Response = ""; +} Deleted: branches/tora3/src/tofyracleconnection.cpp =================================================================== --- branches/tora3/src/tofyracleconnection.cpp 2012-09-24 15:48:52 UTC (rev 4477) +++ branches/tora3/src/tofyracleconnection.cpp 2012-09-24 19:46:32 UTC (rev 4478) @@ -1,864 +0,0 @@ -//*************************************************************************** -/* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2000-2001,2001 Underscore AB -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; only version 2 of -* the License is valid for this program. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -* As a special exception, you have permission to link this program -* with the Oracle Client libraries and distribute executables, as long -* as you follow the requirements of the GNU GPL in regard to all of the -* software in the executable aside from Oracle client libraries. -* -* Specifically you are not permitted to link this program with the -* Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. -* And you are not permitted to distribute binaries compiled against -* these libraries without written consent from Underscore AB. Observe -* that this does not disallow linking to the Qt Free Edition. -* -* All trademarks belong to their respective owners. -* -****************************************************************************/ - -#include <qfile.h> -#include <qregexp.h> -//Added by qt3to4: -#include <QString> - -#ifdef Q_OS_WIN32 -#include <winsock.h> -#endif - -#include "toconnection.h" -#include "toconf.h" -#include "totool.h" -#include "tosql.h" - -#include "ibase.h" - -static toSQL SQLListObjects("toOracleConnection:ListObjects", - "select \"RDB$OWNER_NAME\", \"RDB$RELATION_NAME\", \n" - "'TABLE', \"RDB$DESCRIPTION\" from \"RDB$RELATIONS\" ", - "List the objects to cache for a connection, should have same " - "columns and binds"); - -// -// Helper function to deal with named parameters ":name<type>" syntax -// - -static QString QueryParam(const QString &query, toQList ¶ms) -{ - QString ret; - bool inString = false; - toQList::iterator cpar = params.begin(); - - std::map<QString, QString> binds; - - for (unsigned int i = 0; i < query.length(); i++) - { - QChar c = query.at(i); - switch (char(c)) - { - case '\\': - ret += c; - ret += query.at(++i); - break; - case '\'': - inString = !inString; - ret += c; - break; - case ':': - if (!inString) - { - QString nam; - for (i++; i < query.length(); i++) - { - c = query.at(i); - if (!c.isLetterOrNumber()) - break; - nam += c; - } - QString in; - if (c == '<') - { - for (i++; i < query.length(); i++) - { - c = query.at(i); - if (c == '>') - { - i++; - break; - } - in += c; - } - } - i--; - - if (nam.isEmpty()) - throw QString("No bind name"); - - if (binds.find(nam) != binds.end()) - { - ret += binds[nam]; - break; - } - if (cpar == params.end()) - throw QString("Not all bind variables suplied"); - QString str; - if ((*cpar).isNull()) - { - str = "NULL"; - } - else if ((*cpar).isInt() || (*cpar).isDouble()) - { - str = QString(*cpar); - } - else - { - if (in != "noquote") - str += "'"; - QString tmp = (*cpar); - for (unsigned int j = 0; j < tmp.length(); j++) - { - QChar d = tmp.at(j); - switch (char(d)) - { - case 0: - str += "\\0"; - break; - case '\n': - str += "\\n"; - break; - case '\t': - str += "\\t"; - break; - case '\r': - str += "\\r"; - break; - case '\'': - str += "\\\'"; - break; - case '\"': - str += "\\\""; - break; - case '\\': - str += "\\\\"; - break; - default: - str += d; - } - } - if (in != "noquote") - str += "'"; - } - binds[nam] = str; - ret += str; - cpar++; - break; - } - default: - ret += c; - } - } - // More complex conversion here later - // printf("Parsed: %s\n",(const char *)ret); - return ret.toLatin1(); -} - -// -// Helper function to turn isc_status errors into exceptions -// - -static void ThrowException(long* ... [truncated message content] |
From: <ibr...@us...> - 2012-10-05 15:53:25
|
Revision: 4497 http://tora.svn.sourceforge.net/tora/?rev=4497&view=rev Author: ibre5041 Date: 2012-10-05 15:53:17 +0000 (Fri, 05 Oct 2012) Log Message: ----------- file location cleanups Added Paths: ----------- branches/tora3/doc/devel/sample/ branches/tora3/doc/devel/sample/tosimplequery.cpp branches/tora3/doc/devel/sample/tosimplequery.h branches/tora3/src/obsolete/toresultlabel.cpp branches/tora3/src/obsolete/toresultlabel.h Removed Paths: ------------- branches/tora3/doc/Makefile.am branches/tora3/src/toresultlabel.cpp branches/tora3/src/toresultlabel.h branches/tora3/src/tosimplequery.cpp branches/tora3/src/tosimplequery.h Deleted: branches/tora3/doc/Makefile.am =================================================================== --- branches/tora3/doc/Makefile.am 2012-10-05 15:24:36 UTC (rev 4496) +++ branches/tora3/doc/Makefile.am 2012-10-05 15:53:17 UTC (rev 4497) @@ -1,21 +0,0 @@ -EXTRA_DIST = help - -dist-hook: - rm -rf `find $(distdir) -name .svn` - -tora_docdir = $(DESTDIR)$(libdir) - -install-data-hook: - rm -rf $(tora_docdir)/help - cp -dpR $(top_builddir)/doc/help/tora $(tora_docdir)/help - cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.html - cp -dpR $(top_srcdir)/doc/help/images $(tora_docdir)/help -# cp -dpR $(top_srcdir)/doc/help/api $(tora_docdir)/help - -manualdir = $(top_builddir)/doc/help - -all-local: - echo Making HTML in $(manualdir) - cd $(manualdir) && make html - -SUBDIRS = help Copied: branches/tora3/doc/devel/sample/tosimplequery.cpp (from rev 4490, branches/tora3/src/tosimplequery.cpp) =================================================================== --- branches/tora3/doc/devel/sample/tosimplequery.cpp (rev 0) +++ branches/tora3/doc/devel/sample/tosimplequery.cpp 2012-10-05 15:53:17 UTC (rev 4497) @@ -0,0 +1,122 @@ +#include <list> + +#include <qtoolbar.h> +#include <qlabel.h> +#include <qtoolbutton.h> +#include <qlineedit.h> + +#include "totool.h" +#include "toawr.h" +#include "toresultview.h" +#include "toparamget.h" +#include "tochangeconnection.h" + +//#include "tosimplequery.moc" + +static const char * execute_xpm[] = +{ + "16 16 3 1", + " c None", + ". c #000000", + "+ c #0FFE14", + " ", + " ", + " ", + " . ", + " .. ", + " .+. ", + " .++. ", + " .+++. ", + " .+++. ", + " .++. ", + " .+. ", + " .. ", + " . ", + " ", + " ", + " " +}; + +static const char * tosimplequery_xpm[] = +{ + "16 16 3 1", + " c None", + ". c #000000", + "+ c #FFFFFF", + " ...... ", + " ..++++. ", + " .+.++++. ", + " .++.++++. ", + " .....++++. ", + " .++++++++. ", + " .++++++++. ", + " .++++++++. ", + " .++++++++. ", + " .++++++++. ", + " .++++++++. ", + " .++++++++. ", + " .++++++++. ", + " .++++++++. ", + " .++++++++. ", + " .......... " +}; + +class toAWRTool : public toTool +{ +protected: + virtual const char **pictureXPM(void); +public: + toAWRTool() + : toTool(10003, "AWR") + { } + virtual const char *menuItem() + { + return "Simple Query"; + } + virtual QWidget *toolWindow(QWidget *parent, toConnection &connection) + { + return new toAWR(/*this,*/ parent, connection); + } + virtual void closeWindow(toConnection &connection) {}; +}; + +const char **toAWRTool::pictureXPM(void) +{ + return tosimplequery_xpm; +}; + + +static toAWRTool AWRTool; + +toAWR::toAWR(/*toTool *tool,*/ QWidget *parent, toConnection &connection) + : toToolWidget(/* *tool*/AWRTool, "simplequery.html", parent, connection, "toAWR") +{ + QToolBar *toolbar = Utils::toAllocBar(this, tr("Simple Query")); + layout()->addWidget(toolbar); + + QAction *executeAct = new QAction(QPixmap(execute_xpm), tr("Execute_ current statement"), this); + executeAct->setShortcut(QKeySequence::Refresh); + connect(executeAct, SIGNAL(triggered()), this, SLOT(refresh(void))); + + new toChangeConnection(toolbar); + + Statement = new QLineEdit(this); + layout()->addWidget(Statement); + Result = new toResultView(this); + layout()->addWidget(Result); + connect(Statement, SIGNAL(returnPressed()), this, SLOT(execute())); +} + +void toAWR::execute(void) +{ + try + { + QString sql = Statement->text(); + //toQList params=toParamGet::getParam(this,sql); + //Result->query(sql,params); + Result->query(sql, toQList()); + } + TOCATCH +} + +toAWR::~toAWR() {}; Copied: branches/tora3/doc/devel/sample/tosimplequery.h (from rev 4490, branches/tora3/src/tosimplequery.h) =================================================================== --- branches/tora3/doc/devel/sample/tosimplequery.h (rev 0) +++ branches/tora3/doc/devel/sample/tosimplequery.h 2012-10-05 15:53:17 UTC (rev 4497) @@ -0,0 +1,26 @@ +#ifndef TOAWR_H +#define TOAWR_H + +#include "totool.h" + +class toResultView; +class QLineEdit; +class toConnection; + +class toAWR : public toToolWidget +{ + Q_OBJECT; + + toResultView *Result; + QLineEdit *Statement; + QAction *updateAct; +public: + toAWR(/*toTool *tool,*/ QWidget *parent, toConnection &connection); + virtual ~toAWR(); + +private slots: + void execute(void); +}; + +#endif + Copied: branches/tora3/src/obsolete/toresultlabel.cpp (from rev 4490, branches/tora3/src/toresultlabel.cpp) =================================================================== --- branches/tora3/src/obsolete/toresultlabel.cpp (rev 0) +++ branches/tora3/src/obsolete/toresultlabel.cpp 2012-10-05 15:53:17 UTC (rev 4497) @@ -0,0 +1,122 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2009 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#include "utils.h" + +#include "toconf.h" +#include "toconnection.h" +#include "toeventquery.h" +#include "toresultlabel.h" +#include "tosql.h" +#include "totool.h" + +//Added by qt3to4: +#include <QLabel> + +toResultLabel::toResultLabel(QWidget *parent, const char *name) + : QLabel(parent) +{ + setObjectName(name); + Query = NULL; +} + +toResultLabel::~toResultLabel() +{ + if (Query) + delete Query; +} + +void toResultLabel::query(const QString &sql, const toQList ¶m) +{ + if (!setSQLParams(sql, param)) + return ; + + try + { + clear(); + if (Query) + { + delete Query; + Query = NULL; + } + + Query = new toEventQuery(connection(), toQuery::Background, sql, param); + res.clear(); + connect(Query, SIGNAL(dataAvailable()), this, SLOT(poll())); + connect(Query, SIGNAL(done()), this, SLOT(queryDone())); + Query->slotReadAll(); // indicate that all records should be fetched + Query->start(); + } + TOCATCH +} + +#define THRESHOLD 10240 + +void toResultLabel::poll(void) +{ + try + { + if (!toCheckModal(this)) + return ; + + if (Query) + { + while (Query->hasMore()) + { + res << Query->readValue(); + } + setText(res.join(QString::fromLatin1("/"))); + } + } + catch (const QString &exc) + { + delete Query; + Query = NULL; + toStatusMessage(exc); + } +} + +void toResultLabel::queryDone(void) +{ + delete Query; + Query = NULL; + res.clear(); +} // queryDone \ No newline at end of file Copied: branches/tora3/src/obsolete/toresultlabel.h (from rev 4490, branches/tora3/src/toresultlabel.h) =================================================================== --- branches/tora3/src/obsolete/toresultlabel.h (rev 0) +++ branches/tora3/src/obsolete/toresultlabel.h 2012-10-05 15:53:17 UTC (rev 4497) @@ -0,0 +1,171 @@ + +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2009 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + +#ifndef TORESULTLABEL_H +#define TORESULTLABEL_H + +#include "config.h" +#include "toresult.h" + +#include <qlabel.h> + +class toEventQueryNew; +class toSQL; + +/** This widget displays the result of a query where each item in the stream + * is added to a label separated by an optional string. + */ + +class toResultLabel : public QLabel, public toResult +{ + Q_OBJECT + + toEventQuery *Query; + + QStringList res; + QString Separator; + +public: + /** Create the widget. + * @param parent Parent widget. + * @param name Name of widget. + */ + toResultLabel(QWidget *parent, const char *name = NULL); + /** Destruct object + */ + ~toResultLabel(); + + /** Reimplemented for internal reasons. + */ + virtual void query(const QString &sql, const toQList ¶m); + + /** Handle any connection by default + */ + virtual bool canHandle(toConnection &) + { + return true; + } + + /** Get separator string to use between result. + */ + const QString &separator(void) const + { + return Separator; + } + /** Set separator string to use between result. + */ + void setSeparator(const QString &sep) + { + Separator = sep; + } + + // Why are these needed? +#if 1 + /** Set the SQL statement of this list + * @param sql String containing statement. + */ + void setSQL(const QString &sql) + { + toResult::setSQL(sql); + } + /** Set the SQL statement of this list. This will also affect @ref Name. + * @param sql SQL containing statement. + */ + void setSQL(const toSQL &sql) + { + toResult::setSQL(sql); + } + /** Set new SQL and run query. + * @param sql New sql. + * @see setSQL + */ + void query(const QString &sql) + { + toResult::query(sql); + } + /** Set new SQL and run query. + * @param sql New sql. + * @see setSQL + */ + void query(const toSQL &sql) + { + toResult::query(sql); + } + /** Set new SQL and run query. + * @param sql New sql. + * @see setSQL + */ + void query(const toSQL &sql, toQList &par) + { + toResult::query(sql, par); + } +#endif +public slots: + /** Reimplemented for internal reasons. + */ + virtual void refresh(void) + { + toResult::refresh(); + } + /** Reimplemented for internal reasons. + */ + virtual void executeWithParams(const QString &Param1) + { + toResult::executeWithParams(Param1); + } + /** Reimplemented For internal reasons. + */ + virtual void executeWithParams(const QString &Param1, const QString &Param2) + { + toResult::executeWithParams(Param1, Param2); + } + /** Reimplemented for internal reasons. + */ + virtual void executeWithParams(const QString &Param1, const QString &Param2, const QString &Param3) + { + toResult::executeWithParams(Param1, Param2, Param3); + } +private slots: + void poll(void); + void queryDone(void); +}; + +#endif Deleted: branches/tora3/src/toresultlabel.cpp =================================================================== --- branches/tora3/src/toresultlabel.cpp 2012-10-05 15:24:36 UTC (rev 4496) +++ branches/tora3/src/toresultlabel.cpp 2012-10-05 15:53:17 UTC (rev 4497) @@ -1,122 +0,0 @@ - -/* BEGIN_COMMON_COPYRIGHT_HEADER - * - * TOra - An Oracle Toolkit for DBA's and developers - * - * Shared/mixed copyright is held throughout files in this product - * - * Portions Copyright (C) 2000-2001 Underscore AB - * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2009 Numerous Other Contributors - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * As a special exception, you have permission to link this program - * with the Oracle Client libraries and distribute executables, as long - * as you follow the requirements of the GNU GPL in regard to all of the - * software in the executable aside from Oracle client libraries. - * - * Specifically you are not permitted to link this program with the - * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. - * And you are not permitted to distribute binaries compiled against - * these libraries. - * - * You may link this product with any GPL'd Qt library. - * - * All trademarks belong to their respective owners. - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include "utils.h" - -#include "toconf.h" -#include "toconnection.h" -#include "toeventquery.h" -#include "toresultlabel.h" -#include "tosql.h" -#include "totool.h" - -//Added by qt3to4: -#include <QLabel> - -toResultLabel::toResultLabel(QWidget *parent, const char *name) - : QLabel(parent) -{ - setObjectName(name); - Query = NULL; -} - -toResultLabel::~toResultLabel() -{ - if (Query) - delete Query; -} - -void toResultLabel::query(const QString &sql, const toQList ¶m) -{ - if (!setSQLParams(sql, param)) - return ; - - try - { - clear(); - if (Query) - { - delete Query; - Query = NULL; - } - - Query = new toEventQuery(connection(), toQuery::Background, sql, param); - res.clear(); - connect(Query, SIGNAL(dataAvailable()), this, SLOT(poll())); - connect(Query, SIGNAL(done()), this, SLOT(queryDone())); - Query->slotReadAll(); // indicate that all records should be fetched - Query->start(); - } - TOCATCH -} - -#define THRESHOLD 10240 - -void toResultLabel::poll(void) -{ - try - { - if (!toCheckModal(this)) - return ; - - if (Query) - { - while (Query->hasMore()) - { - res << Query->readValue(); - } - setText(res.join(QString::fromLatin1("/"))); - } - } - catch (const QString &exc) - { - delete Query; - Query = NULL; - toStatusMessage(exc); - } -} - -void toResultLabel::queryDone(void) -{ - delete Query; - Query = NULL; - res.clear(); -} // queryDone \ No newline at end of file Deleted: branches/tora3/src/toresultlabel.h =================================================================== --- branches/tora3/src/toresultlabel.h 2012-10-05 15:24:36 UTC (rev 4496) +++ branches/tora3/src/toresultlabel.h 2012-10-05 15:53:17 UTC (rev 4497) @@ -1,171 +0,0 @@ - -/* BEGIN_COMMON_COPYRIGHT_HEADER - * - * TOra - An Oracle Toolkit for DBA's and developers - * - * Shared/mixed copyright is held throughout files in this product - * - * Portions Copyright (C) 2000-2001 Underscore AB - * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2009 Numerous Other Contributors - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * As a special exception, you have permission to link this program - * with the Oracle Client libraries and distribute executables, as long - * as you follow the requirements of the GNU GPL in regard to all of the - * software in the executable aside from Oracle client libraries. - * - * Specifically you are not permitted to link this program with the - * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. - * And you are not permitted to distribute binaries compiled against - * these libraries. - * - * You may link this product with any GPL'd Qt library. - * - * All trademarks belong to their respective owners. - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef TORESULTLABEL_H -#define TORESULTLABEL_H - -#include "config.h" -#include "toresult.h" - -#include <qlabel.h> - -class toEventQueryNew; -class toSQL; - -/** This widget displays the result of a query where each item in the stream - * is added to a label separated by an optional string. - */ - -class toResultLabel : public QLabel, public toResult -{ - Q_OBJECT - - toEventQuery *Query; - - QStringList res; - QString Separator; - -public: - /** Create the widget. - * @param parent Parent widget. - * @param name Name of widget. - */ - toResultLabel(QWidget *parent, const char *name = NULL); - /** Destruct object - */ - ~toResultLabel(); - - /** Reimplemented for internal reasons. - */ - virtual void query(const QString &sql, const toQList ¶m); - - /** Handle any connection by default - */ - virtual bool canHandle(toConnection &) - { - return true; - } - - /** Get separator string to use between result. - */ - const QString &separator(void) const - { - return Separator; - } - /** Set separator string to use between result. - */ - void setSeparator(const QString &sep) - { - Separator = sep; - } - - // Why are these needed? -#if 1 - /** Set the SQL statement of this list - * @param sql String containing statement. - */ - void setSQL(const QString &sql) - { - toResult::setSQL(sql); - } - /** Set the SQL statement of this list. This will also affect @ref Name. - * @param sql SQL containing statement. - */ - void setSQL(const toSQL &sql) - { - toResult::setSQL(sql); - } - /** Set new SQL and run query. - * @param sql New sql. - * @see setSQL - */ - void query(const QString &sql) - { - toResult::query(sql); - } - /** Set new SQL and run query. - * @param sql New sql. - * @see setSQL - */ - void query(const toSQL &sql) - { - toResult::query(sql); - } - /** Set new SQL and run query. - * @param sql New sql. - * @see setSQL - */ - void query(const toSQL &sql, toQList &par) - { - toResult::query(sql, par); - } -#endif -public slots: - /** Reimplemented for internal reasons. - */ - virtual void refresh(void) - { - toResult::refresh(); - } - /** Reimplemented for internal reasons. - */ - virtual void executeWithParams(const QString &Param1) - { - toResult::executeWithParams(Param1); - } - /** Reimplemented For internal reasons. - */ - virtual void executeWithParams(const QString &Param1, const QString &Param2) - { - toResult::executeWithParams(Param1, Param2); - } - /** Reimplemented for internal reasons. - */ - virtual void executeWithParams(const QString &Param1, const QString &Param2, const QString &Param3) - { - toResult::executeWithParams(Param1, Param2, Param3); - } -private slots: - void poll(void); - void queryDone(void); -}; - -#endif Deleted: branches/tora3/src/tosimplequery.cpp =================================================================== --- branches/tora3/src/tosimplequery.cpp 2012-10-05 15:24:36 UTC (rev 4496) +++ branches/tora3/src/tosimplequery.cpp 2012-10-05 15:53:17 UTC (rev 4497) @@ -1,122 +0,0 @@ -#include <list> - -#include <qtoolbar.h> -#include <qlabel.h> -#include <qtoolbutton.h> -#include <qlineedit.h> - -#include "totool.h" -#include "toawr.h" -#include "toresultview.h" -#include "toparamget.h" -#include "tochangeconnection.h" - -//#include "tosimplequery.moc" - -static const char * execute_xpm[] = -{ - "16 16 3 1", - " c None", - ". c #000000", - "+ c #0FFE14", - " ", - " ", - " ", - " . ", - " .. ", - " .+. ", - " .++. ", - " .+++. ", - " .+++. ", - " .++. ", - " .+. ", - " .. ", - " . ", - " ", - " ", - " " -}; - -static const char * tosimplequery_xpm[] = -{ - "16 16 3 1", - " c None", - ". c #000000", - "+ c #FFFFFF", - " ...... ", - " ..++++. ", - " .+.++++. ", - " .++.++++. ", - " .....++++. ", - " .++++++++. ", - " .++++++++. ", - " .++++++++. ", - " .++++++++. ", - " .++++++++. ", - " .++++++++. ", - " .++++++++. ", - " .++++++++. ", - " .++++++++. ", - " .++++++++. ", - " .......... " -}; - -class toAWRTool : public toTool -{ -protected: - virtual const char **pictureXPM(void); -public: - toAWRTool() - : toTool(10003, "AWR") - { } - virtual const char *menuItem() - { - return "Simple Query"; - } - virtual QWidget *toolWindow(QWidget *parent, toConnection &connection) - { - return new toAWR(/*this,*/ parent, connection); - } - virtual void closeWindow(toConnection &connection) {}; -}; - -const char **toAWRTool::pictureXPM(void) -{ - return tosimplequery_xpm; -}; - - -static toAWRTool AWRTool; - -toAWR::toAWR(/*toTool *tool,*/ QWidget *parent, toConnection &connection) - : toToolWidget(/* *tool*/AWRTool, "simplequery.html", parent, connection, "toAWR") -{ - QToolBar *toolbar = Utils::toAllocBar(this, tr("Simple Query")); - layout()->addWidget(toolbar); - - QAction *executeAct = new QAction(QPixmap(execute_xpm), tr("Execute_ current statement"), this); - executeAct->setShortcut(QKeySequence::Refresh); - connect(executeAct, SIGNAL(triggered()), this, SLOT(refresh(void))); - - new toChangeConnection(toolbar); - - Statement = new QLineEdit(this); - layout()->addWidget(Statement); - Result = new toResultView(this); - layout()->addWidget(Result); - connect(Statement, SIGNAL(returnPressed()), this, SLOT(execute())); -} - -void toAWR::execute(void) -{ - try - { - QString sql = Statement->text(); - //toQList params=toParamGet::getParam(this,sql); - //Result->query(sql,params); - Result->query(sql, toQList()); - } - TOCATCH -} - -toAWR::~toAWR() {}; Deleted: branches/tora3/src/tosimplequery.h =================================================================== --- branches/tora3/src/tosimplequery.h 2012-10-05 15:24:36 UTC (rev 4496) +++ branches/tora3/src/tosimplequery.h 2012-10-05 15:53:17 UTC (rev 4497) @@ -1,26 +0,0 @@ -#ifndef TOAWR_H -#define TOAWR_H - -#include "totool.h" - -class toResultView; -class QLineEdit; -class toConnection; - -class toAWR : public toToolWidget -{ - Q_OBJECT; - - toResultView *Result; - QLineEdit *Statement; - QAction *updateAct; -public: - toAWR(/*toTool *tool,*/ QWidget *parent, toConnection &connection); - virtual ~toAWR(); - -private slots: - void execute(void); -}; - -#endif - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2012-10-15 18:33:28
|
Revision: 4510 http://tora.svn.sourceforge.net/tora/?rev=4510&view=rev Author: ibre5041 Date: 2012-10-15 18:33:22 +0000 (Mon, 15 Oct 2012) Log Message: ----------- Modified Paths: -------------- branches/tora3/CMakeLists.txt branches/tora3/src/core/toresultview.cpp branches/tora3/src/tools/tosgatrace.cpp Modified: branches/tora3/CMakeLists.txt =================================================================== --- branches/tora3/CMakeLists.txt 2012-10-15 15:47:48 UTC (rev 4509) +++ branches/tora3/CMakeLists.txt 2012-10-15 18:33:22 UTC (rev 4510) @@ -24,7 +24,6 @@ #Include current dir SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) - #Set the custom CMake module directory where our include/lib finders are SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") @@ -42,7 +41,7 @@ # Boost headers are required to compile with -DDEBUG (see tologger.h) and also for trotl sql parser # SET(Boost_DEBUG TRUE) -FIND_PACKAGE(Boost 1.46.0) +FIND_PACKAGE(Boost 1.46.0 REQUIRED) IF (Boost_FOUND) MESSAGE(STATUS "Found Boost libraries for debug build: ${Boost_INCLUDE_DIRS}") ELSE (Boost_FOUND) Modified: branches/tora3/src/core/toresultview.cpp =================================================================== --- branches/tora3/src/core/toresultview.cpp 2012-10-15 15:47:48 UTC (rev 4509) +++ branches/tora3/src/core/toresultview.cpp 2012-10-15 18:33:22 UTC (rev 4510) @@ -55,7 +55,7 @@ #include "core/toresultlistformat.h" #include <QApplication> -#include <QClipBoard> +#include <QClipboard> #include <QComboBox> #include <QLineEdit> #include <QMessageBox> Modified: branches/tora3/src/tools/tosgatrace.cpp =================================================================== --- branches/tora3/src/tools/tosgatrace.cpp 2012-10-15 15:47:48 UTC (rev 4509) +++ branches/tora3/src/tools/tosgatrace.cpp 2012-10-15 18:33:22 UTC (rev 4510) @@ -58,7 +58,7 @@ #include <QLabel> #include <QMenuBar> #include <QMessageBox> -#include <QPixMap> +#include <QPixmap> #include <QSplitter> #include <QTabWidget> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |