[Tora-cvs] SF.net SVN: tora: [2119] trunk/tora

[<nn...@us...>]

Revision: 2119
          http://tora.svn.sourceforge.net/tora/?rev=2119&view=rev
Author:   nneul
Date:     2007-09-10 06:32:41 -0700 (Mon, 10 Sep 2007)

Log Message:
-----------
Applied patches from Andreas Piesk for explain plan handling and window splitter sizes.

Modified Paths:
--------------
    trunk/tora/NEWS
    trunk/tora/src/toresultplan.cpp
    trunk/tora/src/tosession.cpp
    trunk/tora/src/tosgatrace.cpp
    trunk/tora/src/totemporary.cpp
    trunk/tora/src/toworksheet.cpp

Modified: trunk/tora/NEWS
===================================================================
--- trunk/tora/NEWS	2007-06-08 13:12:39 UTC (rev 2118)
+++ trunk/tora/NEWS	2007-09-10 13:32:41 UTC (rev 2119)
@@ -20,6 +20,7 @@
 2006-11-21: Apply patch from Michael (m0m) for memo editor width and other size issues
 2006-11-21: Applied patch for postgres 8 schema browsing cleanup from Theo Schlossnagle
 2006-11-21: Applied patch from Michael for syntax highlighting font issues
+2007-09-10: Applied patches from Andreas Piesk for explain plan handling and window splitter sizes.
 
 1.3.21:
 

Modified: trunk/tora/src/toresultplan.cpp
===================================================================
--- trunk/tora/src/toresultplan.cpp	2007-06-08 13:12:39 UTC (rev 2118)
+++ trunk/tora/src/toresultplan.cpp	2007-09-10 13:32:41 UTC (rev 2119)
@@ -130,31 +130,26 @@
     if (sql.length() > 0 && sql.at(sql.length() - 1).latin1() == ';')
         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(toSQLStripSpecifier(sql));
+    QString explain = QString::fromLatin1("EXPLAIN PLAN SET STATEMENT_ID = '%1' INTO %2.%3 FOR %4").
+                      arg(Ident).arg(connection().user()).arg(planTable).arg(toSQLStripSpecifier(sql));
     if (!User.isNull() && User != conn.user().upper())
     {
         try
         {
             conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %1").arg(User));
-        }
-        catch (...)
-        {}
-        try
-        {
             conn.execute(explain);
         }
         catch (...)
         {
             try
             {
-                conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %2").arg(connection().user()));
+                conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %1").arg(connection().user()));
             }
             catch (...)
             {}
             throw;
         }
-        conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %2").arg(connection().user()));
+        conn.execute(QString::fromLatin1("ALTER SESSION SET CURRENT_SCHEMA = %1").arg(connection().user()));
         toQList par;
         Query = new toNoBlockQuery(connection(), toQuery::Normal,
                                    toSQL::string(SQLViewPlan, connection()).

Modified: trunk/tora/src/tosession.cpp
===================================================================
--- trunk/tora/src/tosession.cpp	2007-06-08 13:12:39 UTC (rev 2118)
+++ trunk/tora/src/tosession.cpp	2007-09-10 13:32:41 UTC (rev 2119)
@@ -291,6 +291,11 @@
 
     QSplitter *splitter = new QSplitter(Vertical, this);
     Sessions = new toSessionList(splitter);
+
+    QValueList<int> list;
+    list.append(75);
+    splitter->setSizes(list);
+
     Sessions->setReadAll(true);
     connect(Sessions, SIGNAL(done()), this, SLOT(done()));
 

Modified: trunk/tora/src/tosgatrace.cpp
===================================================================
--- trunk/tora/src/tosgatrace.cpp	2007-06-08 13:12:39 UTC (rev 2118)
+++ trunk/tora/src/tosgatrace.cpp	2007-09-10 13:32:41 UTC (rev 2119)
@@ -185,6 +185,11 @@
     QSplitter *splitter = new QSplitter(Vertical, this);
 
     Trace = new toResultLong(false, false, toQuery::Background, splitter);
+
+    QValueList<int> list;
+    list.append(75);
+    splitter->setSizes(list);
+
     Trace->setReadAll(true);
     Statement = new toSGAStatement(splitter);
 

Modified: trunk/tora/src/totemporary.cpp
===================================================================
--- trunk/tora/src/totemporary.cpp	2007-06-08 13:12:39 UTC (rev 2118)
+++ trunk/tora/src/totemporary.cpp	2007-09-10 13:32:41 UTC (rev 2119)
@@ -156,6 +156,11 @@
     QSplitter *splitter = new QSplitter(Vertical, this);
 
     Objects = new toResultLong(false, false, toQuery::Background, splitter);
+
+    QValueList<int> list;
+    list.append(75);
+    splitter->setSizes(list);
+
     QString unit = toConfigurationSingle::Instance().globalConfig(CONF_SIZE_UNIT, DEFAULT_SIZE_UNIT);
     toQList args;
     toPush(args, toQValue(toSizeDecode(unit)));

Modified: trunk/tora/src/toworksheet.cpp
===================================================================
--- trunk/tora/src/toworksheet.cpp	2007-06-08 13:12:39 UTC (rev 2118)
+++ trunk/tora/src/toworksheet.cpp	2007-09-10 13:32:41 UTC (rev 2119)
@@ -442,6 +442,11 @@
         QSplitter *splitter = new QSplitter(Vertical, this);
 
         Editor = new toWorksheetText(this, splitter);
+
+	QValueList<int> list;
+	list.append(75);
+	splitter->setSizes(list);
+
 #ifdef TO_KDE_KACCELMANAGER
         KAcceleratorManager::setNoAccel( Editor );
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.