From: <da...@us...> - 2006-03-15 12:00:26
|
Revision: 1984 Author: dandfra Date: 2006-03-15 04:00:15 -0800 (Wed, 15 Mar 2006) ViewCVS: http://svn.sourceforge.net/tora/?rev=1984&view=rev Log Message: ----------- Fix for bu #1443947 Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2006-03-14 23:29:14 UTC (rev 1983) +++ trunk/tora/src/toworksheet.cpp 2006-03-15 12:00:15 UTC (rev 1984) @@ -1277,7 +1277,19 @@ { LastLine = line; LastOffset = pos; - Editor->setSelection(line, pos, tokens.line(), tokens.offset()); + int endLine,endCol; + if(Editor->lines()<=tokens.line()){ + endLine=Editor->lines()-1; + endCol=Editor->lineLength(Editor->lines()-1); + }else{ + endLine=tokens.line(); + if(Editor->lineLength(tokens.line())<=tokens.offset()) + endCol=Editor->lineLength(tokens.line()); + else{ + endCol=tokens.offset(); + } + } + Editor->setSelection(line, pos, endLine,endCol); QString t = Editor->selectedText(); bool comment = false; @@ -1328,7 +1340,7 @@ { LastLine = line; LastOffset = pos; - Editor->setSelection(line, pos, tokens.line(), tokens.offset()); + Editor->setSelection(line, pos, endLine, endCol); t = t.mid(i); } if (t.length()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-16 05:09:13
|
Revision: 2582 http://tora.svn.sourceforge.net/tora/?rev=2582&view=rev Author: mrjohnson0 Date: 2008-02-15 21:09:19 -0800 (Fri, 15 Feb 2008) Log Message: ----------- use fileOpened signal to stop running queries Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-02-16 05:07:46 UTC (rev 2581) +++ trunk/tora/src/toworksheet.cpp 2008-02-16 05:09:19 UTC (rev 2582) @@ -414,6 +414,8 @@ layout()->addWidget(EditSplitter); Editor = new toWorksheetText(this, EditSplitter); + // stop any running query when a file is loaded + connect(Editor, SIGNAL(fileOpened()), this, SLOT(stop())); ResultTab = new toTabWidget(EditSplitter); QWidget *container = new QWidget(ResultTab); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-24 20:00:18
|
Revision: 2604 http://tora.svn.sourceforge.net/tora/?rev=2604&view=rev Author: mrjohnson0 Date: 2008-02-24 12:00:22 -0800 (Sun, 24 Feb 2008) Log Message: ----------- if owner is null use the selected schema. this makes it possible to get a describe on postgres where the schema is much less likely to be the current username. Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-02-24 19:06:23 UTC (rev 2603) +++ trunk/tora/src/toworksheet.cpp 2008-02-24 20:00:22 UTC (rev 2604) @@ -1480,9 +1480,8 @@ } if(owner.isNull()) - columns->changeParams(table); - else - columns->changeParams(owner, table); + owner = Schema->currentText(); + columns->changeParams(owner, table); columns->show(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-28 00:43:06
|
Revision: 2605 http://tora.svn.sourceforge.net/tora/?rev=2605&view=rev Author: mrjohnson0 Date: 2008-02-27 16:43:06 -0800 (Wed, 27 Feb 2008) Log Message: ----------- out of bounds crash Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-02-24 20:00:22 UTC (rev 2604) +++ trunk/tora/src/toworksheet.cpp 2008-02-28 00:43:06 UTC (rev 2605) @@ -1040,7 +1040,7 @@ QChar cmp = '\n'; int lastnl = 0; int lines = 0; - for (int i = 0;i < result.offset();i++) { + for (int i = 0;i < result.offset() && i < sql.length();i++) { if (sql.at(i) == cmp) { LastOffset = 0; lastnl = i + 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-15 17:44:36
|
Revision: 2617 http://tora.svn.sourceforge.net/tora/?rev=2617&view=rev Author: mrjohnson0 Date: 2008-03-15 10:44:41 -0700 (Sat, 15 Mar 2008) Log Message: ----------- fixes tora autocommit in worksheet Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-03-02 18:24:31 UTC (rev 2616) +++ trunk/tora/src/toworksheet.cpp 2008-03-15 17:44:41 UTC (rev 2617) @@ -1105,10 +1105,15 @@ if(!error) changeResult(ResultTab->indexOf(CurrentTab)); - static QRegExp re(QString::fromLatin1("^[1-9]\\d* rows processed$")); + // the sql string will be trimmed but case will be same as the + // original. the code originally compared the result return, but + // that class doesn't know if a commit is needed either. + + static QRegExp re(QString::fromLatin1("^SELECT")); + re.setCaseSensitivity(Qt::CaseInsensitive); try { - if (result.contains(re)) { - if (!toConfigurationSingle::Instance().globalConfig(CONF_AUTO_COMMIT, "").isEmpty()) + if(!sql.contains(re)) { + if(!toConfigurationSingle::Instance().globalConfig(CONF_AUTO_COMMIT, "").isEmpty()) connection().commit(); else toMainWidget()->setNeedCommit(connection()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-04-09 03:24:49
|
Revision: 2683 http://tora.svn.sourceforge.net/tora/?rev=2683&view=rev Author: mrjohnson0 Date: 2008-04-08 20:24:48 -0700 (Tue, 08 Apr 2008) Log Message: ----------- don't show error messages Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-04-07 07:27:41 UTC (rev 2682) +++ trunk/tora/src/toworksheet.cpp 2008-04-09 03:24:48 UTC (rev 2683) @@ -1175,10 +1175,7 @@ { QString str = result; str += "\n" + tr("(Duration %1)").arg(buf); - if (error) - - toStatusMessage(str); - else + if (!error) toStatusMessage(str, false, false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-04-09 03:37:27
|
Revision: 2685 http://tora.svn.sourceforge.net/tora/?rev=2685&view=rev Author: mrjohnson0 Date: 2008-04-08 20:37:33 -0700 (Tue, 08 Apr 2008) Log Message: ----------- don't set connection dirty if there was an error Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-04-09 03:27:06 UTC (rev 2684) +++ trunk/tora/src/toworksheet.cpp 2008-04-09 03:37:33 UTC (rev 2685) @@ -1179,26 +1179,27 @@ toStatusMessage(str, false, false); } - if (!error) + if (!error) { changeResult(ResultTab->indexOf(CurrentTab)); - // the sql string will be trimmed but case will be same as the - // original. the code originally compared the result return, but - // that class doesn't know if a commit is needed either. + // the sql string will be trimmed but case will be same as the + // original. the code originally compared the result return, but + // that class doesn't know if a commit is needed either. - static QRegExp re(QString::fromLatin1("^SELECT")); - re.setCaseSensitivity(Qt::CaseInsensitive); - try - { - if (!sql.contains(re)) + static QRegExp re(QString::fromLatin1("^SELECT")); + re.setCaseSensitivity(Qt::CaseInsensitive); + try { - if (toConfigurationSingle::Instance().autoCommit()) - connection().commit(); - else - toMainWidget()->setNeedCommit(connection()); + if (!sql.contains(re)) + { + if (toConfigurationSingle::Instance().autoCommit()) + connection().commit(); + else + toMainWidget()->setNeedCommit(connection()); + } } + TOCATCH; } - TOCATCH; saveDefaults(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-05-17 03:53:16
|
Revision: 2754 http://tora.svn.sourceforge.net/tora/?rev=2754&view=rev Author: mrjohnson0 Date: 2008-05-16 20:51:28 -0700 (Fri, 16 May 2008) Log Message: ----------- fix a couple crashes when ran from toworksheetwidget Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-05-15 04:29:49 UTC (rev 2753) +++ trunk/tora/src/toworksheet.cpp 2008-05-17 03:51:28 UTC (rev 2754) @@ -915,7 +915,7 @@ } // unhide the results pane if there's something to show - if (first == "SELECT" || ResultTab->currentIndex() != 0) + if (first == "SELECT" || (ResultTab && ResultTab->currentIndex() != 0)) unhideResults(); toQList param; @@ -1169,7 +1169,8 @@ } if (!error) { - changeResult(ResultTab->indexOf(CurrentTab)); + if(ResultTab) + changeResult(ResultTab->indexOf(CurrentTab)); // the sql string will be trimmed but case will be same as the // original. the code originally compared the result return, but This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-05-18 19:33:41
|
Revision: 2755 http://tora.svn.sourceforge.net/tora/?rev=2755&view=rev Author: mrjohnson0 Date: 2008-05-18 12:22:17 -0700 (Sun, 18 May 2008) Log Message: ----------- unhide results for describe Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-05-17 03:51:28 UTC (rev 2754) +++ trunk/tora/src/toworksheet.cpp 2008-05-18 19:22:17 UTC (rev 2755) @@ -820,6 +820,8 @@ if (part[0].toUpper() == QString("DESC") || part[0].toUpper() == QString("DESCRIBE")) { + unhideResults(); + if (toIsOracle(connection())) { if (part.count() == 2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-05-28 15:33:31
|
Revision: 2809 http://tora.svn.sourceforge.net/tora/?rev=2809&view=rev Author: mrjohnson0 Date: 2008-05-28 08:32:27 -0700 (Wed, 28 May 2008) Log Message: ----------- it's nice to see the query results Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-05-27 21:27:46 UTC (rev 2808) +++ trunk/tora/src/toworksheet.cpp 2008-05-28 15:32:27 UTC (rev 2809) @@ -819,6 +819,8 @@ if (part[0].toUpper() == QString("DESC") || part[0].toUpper() == QString("DESCRIBE")) { + unhideResults(); + if (toIsOracle(connection())) { if (part.count() == 2) @@ -888,8 +890,6 @@ if (chk.startsWith(QString::fromLatin1("create trigger "))) nobinds = true; - unhideResults(); - if (type == OnlyPlan) { ResultTab->setCurrentIndex(ResultTab->indexOf(Plan)); @@ -915,6 +915,10 @@ return ; } + // unhide the results pane if there's something to show + if (first == "SELECT" || (ResultTab && ResultTab->currentIndex() != 0)) + unhideResults(); + toQList param; if (!nobinds) try This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-05-29 07:27:07
|
Revision: 2810 http://tora.svn.sourceforge.net/tora/?rev=2810&view=rev Author: subik Date: 2008-05-29 00:27:14 -0700 (Thu, 29 May 2008) Log Message: ----------- show results for explain plan too Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-05-28 15:32:27 UTC (rev 2809) +++ trunk/tora/src/toworksheet.cpp 2008-05-29 07:27:14 UTC (rev 2810) @@ -894,6 +894,7 @@ { ResultTab->setCurrentIndex(ResultTab->indexOf(Plan)); Plan->query(str); + unhideResults(); } else if (!describe(QueryString)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-05-31 20:10:20
|
Revision: 2819 http://tora.svn.sourceforge.net/tora/?rev=2819&view=rev Author: mrjohnson0 Date: 2008-05-31 13:10:28 -0700 (Sat, 31 May 2008) Log Message: ----------- when unhiding, splitter should not jump to middle of text. it's quite irritating. use minimal space for results Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-05-31 19:53:02 UTC (rev 2818) +++ trunk/tora/src/toworksheet.cpp 2008-05-31 20:10:28 UTC (rev 2819) @@ -1296,7 +1296,7 @@ QList<int> list = EditSplitter->sizes(); if (list[1] == 0) { - list[0] = 1; + list[0] = 10000; list[1] = 1; EditSplitter->setSizes(list); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-06-01 01:03:40
|
Revision: 2828 http://tora.svn.sourceforge.net/tora/?rev=2828&view=rev Author: mrjohnson0 Date: 2008-05-31 18:03:47 -0700 (Sat, 31 May 2008) Log Message: ----------- put exec in plsql block for oracle. now i can finally run stuff like this: exec dbms_stats.gather_table_stats('SYSTEM', 'FOO', cascade => TRUE); Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-05-31 23:31:36 UTC (rev 2827) +++ trunk/tora/src/toworksheet.cpp 2008-06-01 01:03:47 UTC (rev 2828) @@ -900,6 +900,13 @@ toSQLParse::stringTokenizer tokens(str); QString first = tokens.getToken(true).toUpper(); + + if (toIsOracle(connection()) && first == "EXEC") { + // put exec in anonymous plsql block or they won't work + QueryString = QueryString.trimmed().right(QueryString.length() - 4); + QueryString = QString("BEGIN\n%1;\nEND;").arg(QueryString); + } + if (first == QString::fromLatin1("REM") || first == QString::fromLatin1("ASSIGN") || first == QString::fromLatin1("PROMPT") || This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-06-04 08:16:44
|
Revision: 2839 http://tora.svn.sourceforge.net/tora/?rev=2839&view=rev Author: subik Date: 2008-06-04 01:16:47 -0700 (Wed, 04 Jun 2008) Log Message: ----------- recent files are working correctly now Modified Paths: -------------- trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-06-04 07:16:26 UTC (rev 2838) +++ trunk/tora/src/toworksheet.cpp 2008-06-04 08:16:47 UTC (rev 2839) @@ -1920,12 +1920,19 @@ toWorksheet *toWorksheet::fileWorksheet(const QString &file) { - toWorksheet *worksheet = new toWorksheet(toMainWidget()->workspace(), + QMdiSubWindow * w = new QMdiSubWindow(toMainWidget()->workspace()); + + toWorksheet *worksheet = new toWorksheet(w, toMainWidget()->currentConnection(), false); worksheet->editor()->openFilename(file); worksheet->setCaption(); - worksheet->show(); + + w->setAttribute(Qt::WA_DeleteOnClose); + w->setWidget(worksheet); + w->setWindowIcon(QIcon(*WorksheetTool.toolbarImage())); + toMainWidget()->workspace()->addSubWindow(w); + w->show(); toMainWidget()->updateWindowsMenu(); return worksheet; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |