Menu
▾
▴
tora-cvs
|
From: <tom...@us...> - 2010-03-23 21:13:28
|
Revision: 3470
http://tora.svn.sourceforge.net/tora/?rev=3470&view=rev
Author: tomasstraupis
Date: 2010-03-23 21:13:22 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
Update version for CMake
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/README.RELEASE
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2010-03-23 21:09:30 UTC (rev 3469)
+++ trunk/tora/CMakeLists.txt 2010-03-23 21:13:22 UTC (rev 3470)
@@ -51,7 +51,7 @@
#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level)
SET (VERSION_MAJOR "2")
SET (VERSION_MINOR "1")
-SET (VERSION_PATCH "1")
+SET (VERSION_PATCH "2")
SET (VERSION_SUFFIX "")
SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
Modified: trunk/tora/README.RELEASE
===================================================================
--- trunk/tora/README.RELEASE 2010-03-23 21:09:30 UTC (rev 3469)
+++ trunk/tora/README.RELEASE 2010-03-23 21:13:22 UTC (rev 3470)
@@ -5,6 +5,7 @@
---------------
Check out the tora module from SVN
Edit the configure.ac file to set the version number
+Edit CMakeLists.txt file to set the version number for CMake
Edit the NEWS file to set a release date
Commit, and then copy trunk to an appropriately named tag, such as:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2010-03-30 12:48:57
|
Revision: 3482
http://tora.svn.sourceforge.net/tora/?rev=3482&view=rev
Author: meskes
Date: 2010-03-30 12:48:44 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
Fixed some typos
Modified Paths:
--------------
trunk/tora/doc/help/alert.html
trunk/tora/doc/help/alert.texi
trunk/tora/doc/help/analyze.html
trunk/tora/doc/help/analyze.texi
trunk/tora/doc/help/browser.html
trunk/tora/doc/help/browser.texi
trunk/tora/doc/help/globalsettings.html
trunk/tora/doc/help/invalid.html
trunk/tora/doc/help/invalid.texi
trunk/tora/doc/help/preferences.texi
trunk/tora/doc/help/sqledit.html
trunk/tora/doc/help/sqledit.texi
trunk/tora/src/i18n/tora_fr.ts
trunk/tora/src/i18n/tora_it.ts
trunk/tora/src/i18n/tora_se.ts
trunk/tora/src/loki/include/loki/CachedFactory.h
trunk/tora/src/templates/sqlfunctions.tpl
trunk/tora/src/tobrowserindexwidget.cpp
trunk/tora/src/toconnection.h
trunk/tora/src/todatabasesettingui.ui
trunk/tora/src/todebug.cpp
trunk/tora/src/tohtml.cpp
trunk/tora/src/tomain.h
trunk/tora/src/toresulttableviewedit.h
trunk/tora/src/tosql.h
trunk/tora/src/ts_log/decorator.h
Modified: trunk/tora/doc/help/alert.html
===================================================================
--- trunk/tora/doc/help/alert.html 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/alert.html 2010-03-30 12:48:44 UTC (rev 3482)
@@ -36,7 +36,7 @@
<h3 class="section">4.15 Alert Tool</h3>
-<p><a name="index-Alert-Tool-33"></a>This tool is usefull for debugging database packages that send or depend on receiving dbms alerts.
+<p><a name="index-Alert-Tool-33"></a>This tool is useful for debugging database packages that send or depend on receiving dbms alerts.
<div class="block-image"><img src="images/alert.png" alt="images/alert.png"></div>
@@ -53,7 +53,7 @@
<br><dt><strong>Message</strong><dd>Message to send in an alert. Pressing return in this lineedit will send the alert.
- <br><dt><strong>Edit message in memo</strong><dd>Edit the message in a memo editor, usefull for sending newlines and longer messages.
+ <br><dt><strong>Edit message in memo</strong><dd>Edit the message in a memo editor, useful for sending newlines and longer messages.
<br><dt><strong>Send alert</strong><dd>Send the currently defined alert. You can also send an alert by pressing return in the message line editor.
Modified: trunk/tora/doc/help/alert.texi
===================================================================
--- trunk/tora/doc/help/alert.texi 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/alert.texi 2010-03-30 12:48:44 UTC (rev 3482)
@@ -1,7 +1,7 @@
@node alert
@section Alert Tool
@cindex Alert Tool
-This tool is usefull for debugging database packages that send or depend on receiving dbms alerts.
+This tool is useful for debugging database packages that send or depend on receiving dbms alerts.
@image{images/alert,13cm}
@@ -24,7 +24,7 @@
Message to send in an alert. Pressing return in this lineedit will send the alert.
@item @strong{Edit message in memo}
-Edit the message in a memo editor, usefull for sending newlines and longer messages.
+Edit the message in a memo editor, useful for sending newlines and longer messages.
@item @strong{Send alert}
Send the currently defined alert. You can also send an alert by pressing return in the message line editor.
Modified: trunk/tora/doc/help/analyze.html
===================================================================
--- trunk/tora/doc/help/analyze.html 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/analyze.html 2010-03-30 12:48:44 UTC (rev 3482)
@@ -37,7 +37,7 @@
<h3 class="section">4.14 Statistics manager</h3>
<p><a name="index-Statistics-manager-32"></a>
-This tool is usefull for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics.
+This tool is useful for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics.
<div class="block-image"><img src="images/analyze.png" alt="images/analyze.png"></div>
Modified: trunk/tora/doc/help/analyze.texi
===================================================================
--- trunk/tora/doc/help/analyze.texi 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/analyze.texi 2010-03-30 12:48:44 UTC (rev 3482)
@@ -2,7 +2,7 @@
@section Statistics manager
@cindex Statistics manager
-This tool is usefull for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics.
+This tool is useful for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics.
@image{images/analyze,15cm}
Modified: trunk/tora/doc/help/browser.html
===================================================================
--- trunk/tora/doc/help/browser.html 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/browser.html 2010-03-30 12:48:44 UTC (rev 3482)
@@ -249,7 +249,7 @@
<br><dt><strong>Go to last row</strong><dd>Go to the last record in the editor. Observe that this will read in all available records in the table into memory.
- <br><dt><strong>Toggle between table or single record editing</strong><dd>Swith between editing data as a table or single record (the later one could be usefull for table with a lot of columns).
+ <br><dt><strong>Toggle between table or single record editing</strong><dd>Swith between editing data as a table or single record (the later one could be useful for table with a lot of columns).
</dl>
Modified: trunk/tora/doc/help/browser.texi
===================================================================
--- trunk/tora/doc/help/browser.texi 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/browser.texi 2010-03-30 12:48:44 UTC (rev 3482)
@@ -279,7 +279,7 @@
Go to the last record in the editor. Observe that this will read in all available records in the table into memory.
@item @strong{Toggle between table or single record editing}
-Swith between editing data as a table or single record (the later one could be usefull for table with a lot of columns).
+Swith between editing data as a table or single record (the later one could be useful for table with a lot of columns).
@end table
Modified: trunk/tora/doc/help/globalsettings.html
===================================================================
--- trunk/tora/doc/help/globalsettings.html 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/globalsettings.html 2010-03-30 12:48:44 UTC (rev 3482)
@@ -49,7 +49,7 @@
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Antialias fonts</strong> </td><td valign="top" width="80%">Check this if you want TOra to use antialiased fonts in X11 if available. This option may not be available (Regardless of if you have access to antialiased fonts or not).
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Docks use toolbars</strong> </td><td valign="top" width="80%">This option tells TOra how to emulate docked windows when they are not available. Docked windows are not available if you do not use KDE and have a Qt version less than 3 (If you run in windows you're it). If this is checked docks will be emulated with a toolbar, this has the drawback that you can't resize them. If unchecked docks appear in normal windows.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Style</strong> </td><td valign="top" width="80%">The GUI style to use for the TOra application. This switch is only available for Qt only applications.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display alerts in statusbar only</strong> </td><td valign="top" width="80%">Display errors only in the statusbar. This is really usefull since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display alerts in statusbar only</strong> </td><td valign="top" width="80%">Display errors only in the statusbar. This is really useful since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Connect history</strong> </td><td valign="top" width="80%">How many connection entries to save in the new connection history list.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Table scale</strong> </td><td valign="top" width="80%">This is the scale which to use when printing lists. Lists on paper can usually be a little smaller and still be readable. Given as a fraction where 0.5 means half the size on paper and 1.0 the same size.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Status message</strong> </td><td valign="top" width="80%">The number of seconds to display error messages in the status bar. If you specify 0 they are kept until the next message is displayed.
Modified: trunk/tora/doc/help/invalid.html
===================================================================
--- trunk/tora/doc/help/invalid.html 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/invalid.html 2010-03-30 12:48:44 UTC (rev 3482)
@@ -37,7 +37,7 @@
<h3 class="section">4.16 Invalid Objects</h3>
<p><a name="index-Invalid-Objects-34"></a>
-This tool is usefull to recompile invalid objects in the database.
+This tool is useful to recompile invalid objects in the database.
<div class="block-image"><img src="images/invalid.png" alt="images/invalid.png"></div>
Modified: trunk/tora/doc/help/invalid.texi
===================================================================
--- trunk/tora/doc/help/invalid.texi 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/invalid.texi 2010-03-30 12:48:44 UTC (rev 3482)
@@ -2,7 +2,7 @@
@section Invalid Objects
@cindex Invalid Objects
-This tool is usefull to recompile invalid objects in the database.
+This tool is useful to recompile invalid objects in the database.
@image{images/invalid,15cm}
@@ -27,4 +27,4 @@
@verbatim
alter <object_type> <schema.object_name> compile
@end verbatim
-@end table
\ No newline at end of file
+@end table
Modified: trunk/tora/doc/help/preferences.texi
===================================================================
--- trunk/tora/doc/help/preferences.texi 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/preferences.texi 2010-03-30 12:48:44 UTC (rev 3482)
@@ -44,7 +44,7 @@
@item @strong{Antialias fonts} @tab Check this if you want TOra to use antialiased fonts in X11 if available. This option may not be available (Regardless of if you have access to antialiased fonts or not).
@item @strong{Docks use toolbars} @tab This option tells TOra how to emulate docked windows when they are not available. Docked windows are not available if you do not use KDE and have a Qt version less than 3 (If you run in windows you're it). If this is checked docks will be emulated with a toolbar, this has the drawback that you can't resize them. If unchecked docks appear in normal windows.
@item @strong{Style} @tab The GUI style to use for the TOra application. This switch is only available for Qt only applications.
-@item @strong{Display alerts in statusbar only} @tab Display errors only in the statusbar. This is really usefull since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work.
+@item @strong{Display alerts in statusbar only} @tab Display errors only in the statusbar. This is really useful since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work.
@item @strong{Connect history} @tab How many connection entries to save in the new connection history list.
@item @strong{Table scale} @tab This is the scale which to use when printing lists. Lists on paper can usually be a little smaller and still be readable. Given as a fraction where 0.5 means half the size on paper and 1.0 the same size.
@item @strong{Status message} @tab The number of seconds to display error messages in the status bar. If you specify 0 they are kept until the next message is displayed.
Modified: trunk/tora/doc/help/sqledit.html
===================================================================
--- trunk/tora/doc/help/sqledit.html 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/sqledit.html 2010-03-30 12:48:44 UTC (rev 3482)
@@ -47,7 +47,7 @@
<p>The window is divided into several parts. To the left is a list of SQL statements available divided into modules. When an item is selected in this list you can use the right part of the screen to modify the SQL associated by the selected name.
- <p>The right part of the window is divided into the name and version at the top. The version is also preceeded with the name of the provider (Usually <strong>Oracle</strong>) separated by a colon. Each statement name can have several versions of an SQL. You can add a new version by simply entering a new text into the version combobox. You can also select any of the existing versions by selecting them from the list.
+ <p>The right part of the window is divided into the name and version at the top. The version is also preceded with the name of the provider (Usually <strong>Oracle</strong>) separated by a colon. Each statement name can have several versions of an SQL. You can add a new version by simply entering a new text into the version combobox. You can also select any of the existing versions by selecting them from the list.
<p>Below the name and version is the description which is independent from the version. Below that is a worksheet (see <a href="worksheet.html#worksheet">SQL Worksheet</a>) which you can use to edit and test the SQL statement that should be associated with the given name and version.
Modified: trunk/tora/doc/help/sqledit.texi
===================================================================
--- trunk/tora/doc/help/sqledit.texi 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/doc/help/sqledit.texi 2010-03-30 12:48:44 UTC (rev 3482)
@@ -14,7 +14,7 @@
The window is divided into several parts. To the left is a list of SQL statements available divided into modules. When an item is selected in this list you can use the right part of the screen to modify the SQL associated by the selected name.
-The right part of the window is divided into the name and version at the top. The version is also preceeded with the name of the provider (Usually @strong{Oracle}) separated by a colon. Each statement name can have several versions of an SQL. You can add a new version by simply entering a new text into the version combobox. You can also select any of the existing versions by selecting them from the list.
+The right part of the window is divided into the name and version at the top. The version is also preceded with the name of the provider (Usually @strong{Oracle}) separated by a colon. Each statement name can have several versions of an SQL. You can add a new version by simply entering a new text into the version combobox. You can also select any of the existing versions by selecting them from the list.
Below the name and version is the description which is independent from the version. Below that is a worksheet (@pxref{worksheet,SQL Worksheet}) which you can use to edit and test the SQL statement that should be associated with the given name and version.
Modified: trunk/tora/src/i18n/tora_fr.ts
===================================================================
--- trunk/tora/src/i18n/tora_fr.ts 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/i18n/tora_fr.ts 2010-03-30 12:48:44 UTC (rev 3482)
@@ -2289,7 +2289,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Specify if changes should be automatically commited.</source>
+ <source>Specify if changes should be automatically committed.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3756,7 +3756,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Exceded qualifier max in toHtml</source>
+ <source>Exceeded qualifier max in toHtml</source>
<translation type="unfinished"></translation>
</message>
<message>
Modified: trunk/tora/src/i18n/tora_it.ts
===================================================================
--- trunk/tora/src/i18n/tora_it.ts 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/i18n/tora_it.ts 2010-03-30 12:48:44 UTC (rev 3482)
@@ -3270,7 +3270,7 @@
</message>
<message>
<location filename="../ui_todatabasesettingui.h" line="214"/>
- <source>Specify if changes should be automatically commited.</source>
+ <source>Specify if changes should be automatically committed.</source>
<translation>Specificare se i cambiamenti devono essere committati automaticamente.</translation>
</message>
<message>
@@ -5110,7 +5110,7 @@
</message>
<message>
<location filename="../tohtml.cpp" line="197"/>
- <source>Exceded qualifier max in toHtml</source>
+ <source>Exceeded qualifier max in toHtml</source>
<translation type="unfinished"></translation>
</message>
<message>
Modified: trunk/tora/src/i18n/tora_se.ts
===================================================================
--- trunk/tora/src/i18n/tora_se.ts 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/i18n/tora_se.ts 2010-03-30 12:48:44 UTC (rev 3482)
@@ -2336,7 +2336,7 @@
<translation>&Autocommit på alla ändringar</translation>
</message>
<message>
- <source>Specify if changes should be automatically commited.</source>
+ <source>Specify if changes should be automatically committed.</source>
<translation>Anger att alla databasändringar automatiskt skall sparas i databasen direkt.</translation>
</message>
<message>
@@ -3909,7 +3909,7 @@
<translation>Oavslutat attribut på slutet</translation>
</message>
<message>
- <source>Exceded qualifier max in toHtml</source>
+ <source>Exceeded qualifier max in toHtml</source>
<translation>Attribut överskred max i toHtml</translation>
</message>
<message>
Modified: trunk/tora/src/loki/include/loki/CachedFactory.h
===================================================================
--- trunk/tora/src/loki/include/loki/CachedFactory.h 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/loki/include/loki/CachedFactory.h 2010-03-30 12:48:44 UTC (rev 3482)
@@ -151,7 +151,7 @@
*
* This implementation will prevent from Creating more than maxCreation objects
* within byTime ms by throwing an exception.
- * Could be usefull to detect prevent loads (http connection for instance).
+ * Could be useful to detect prevent loads (http connection for instance).
* Use the setRate method to set the rate parameters.
* default is 10 objects in a second.
*/
Modified: trunk/tora/src/templates/sqlfunctions.tpl
===================================================================
--- trunk/tora/src/templates/sqlfunctions.tpl 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/templates/sqlfunctions.tpl 2010-03-30 12:48:44 UTC (rev 3482)
@@ -1,6 +1,6 @@
Aggregate Functions:COVAR_POP ( expr1 , expr2 )=Get the population covariance of a set of pairs.<P>\n\nPairs where either <I>expr1</I> or <I>expr2</I> are eliminated first. Then the following\ncalculation is performed:\n\n<PRE>\n(SUM(expr1 * expr2) - SUM(expr2) * SUM(expr1) / n) / n\n</PRE>\n\nThe function returns a number, if applied to an empty set NULL is returned.<P>\n<B>Example:</B>\n<PRE>\nSELECT itemid,COVAR_POP(amount,profit) FROM saleitems GROUP BY itemid;\n\n ITEMID COVAR_POP(AMOUNT,PROFIT)\n---------- ------------------------\n 1 84000\n 2 5062.5\n 3 325000\n 4 4111.11111\n</PRE>
Aggregate Functions:COVAR_SAMP ( expr1 , expr2 )=Get the sample covariance of a set of pairs.<P>\n\nPairs where either <I>expr1</I> or <I>expr2</I> are eliminated first. Then the following\ncalculation is performed:\n\n<PRE>\n(SUM(expr1 * expr2) - SUM(expr2) * SUM(expr1) / n) / (n - 1)\n</PRE>\n\nThe function returns a number, if applied to an empty set NULL is returned.<P>\n<B>Example:</B>\n<PRE>\nSELECT itemid,COVAR_SAMP(amount,profit) FROM saleitems GROUP BY itemid;\n\n ITEMID COVAR_POP(AMOUNT,PROFIT)\n---------- ------------------------\n 1 84000\n 2 5062.5\n 3 325000\n 4 4111.11111\n</PRE>
-Aggregate Functions:GROUPING ( expr )=This function is only usefull in select statements with a group by extension such as <CODE>ROLLUP</CODE>\nor <CODE>CUBE</CODE>. These function generate extra rows with nulls which is the group by aggregate.\nThis function can be use to distinguish these rows from rows that are actually null.<P>\nThe <I>expr</I> must match a group by expression. If the <I>expr</I> is a null that represent an\naggregate row this function returns 1, otherwise it returns 0.<P>\n<B>Example:</B>\n<PRE>\nSELECT DECODE(GROUPING(itemid),1,'Total',itemid) item,\n SUM(amount) amount,\n SUM(profit) profit\n FROM saleitems\n GROUP BY ROLLUP (itemid);\n\nITEM AMOUNT PROFIT\n----- ------ ------\n1 12000 2200\n2 2760 195\n3 10000 2200\n4 1300 170\nTotal 26060 4765\n</PRE>
+Aggregate Functions:GROUPING ( expr )=This function is only useful in select statements with a group by extension such as <CODE>ROLLUP</CODE>\nor <CODE>CUBE</CODE>. These function generate extra rows with nulls which is the group by aggregate.\nThis function can be use to distinguish these rows from rows that are actually null.<P>\nThe <I>expr</I> must match a group by expression. If the <I>expr</I> is a null that represent an\naggregate row this function returns 1, otherwise it returns 0.<P>\n<B>Example:</B>\n<PRE>\nSELECT DECODE(GROUPING(itemid),1,'Total',itemid) item,\n SUM(amount) amount,\n SUM(profit) profit\n FROM saleitems\n GROUP BY ROLLUP (itemid);\n\nITEM AMOUNT PROFIT\n----- ------ ------\n1 12000 2200\n2 2760 195\n3 10000 2200\n4 1300 170\nTotal 26060 4765\n</PRE>
Aggregate Functions:MAX( expr )=Get the largest value of <I>expr</I>.<P>\n<B>Example:</B>\n<PRE>\nSELECT MAX(amount) FROM saleitems;\n\nMAX(AMOUNT)\n-----------\n 4000\n</PRE>
Aggregate Functions:MIN ( expr )=Get the smallest value of <I>expr</I>.<P>\n<B>Example:</B>\n<PRE>\nSELECT MIN(amount) FROM saleitems;\n\nMIN(AMOUNT)\n-----------\n 240\n</PRE>
Aggregate Functions:REGR_AVGX ( expr1 , expr2 )=Pairs where either <I>expr1</I> or <I>expr2</I> are eliminated to begin with. Then the following function is calculated:\n<PRE>\nAVG ( expr2 )\n</PRE>\n<B>Example:</B><P>\n<PRE>\nSELECT TRUNC((SYSDATE - saledate) / 7) WEEK,\n REGR_AVGX ( SYSDATE - saledate , amount )\n FROM sales , saleitems\n WHERE sales.saleid = saleitems.saleid\n GROUP BY TRUNC((SYSDATE - saledate) / 7);\n\n WEEK REGR_AVGX(SYSDATE-SALEDATE,AMOUNT)\n---------- ----------------------------------\n 0 1280\n 8 500\n 10 300\n 13 3333.33333\n 15 1360\n 73 1000\n 74 1400\n</PRE>
@@ -66,7 +66,7 @@
Char to Char Functions:REPLACE ( char , search , replace )=This function will return a string where every occurance in <I>char</I> of the string <I>search</I> is replaced with the <I>replace</I> string.<P>\n<B>Example:</B>\n<PRE>\nSELECT REPLACE ('Gnu','Gnu','Gnu Is Not Unix') FROM DUAL;\n\nREPLACE('GNU','\n---------------\nGnu Is Not Unix\n</PRE>
Char to Char Functions:RPAD ( char1 , n , char2 )=This function returns <I>char1</I> padded from the right to <I>n</I> number of characters. If <I>char2</I> is specified this is used for padding instead of space which is the default.<P>\n<B>Examples:</B>\n<PRE>\nSELECT RPAD ( 'Padding<' , 12 , '=-' ) FROM DUAL;\n\nRPAD('PADDIN\n------------\nPadding<=-=-\n</PRE>
Char to Char Functions:RTRIM ( char1 , char2 )=Removes all characters from the <I>char1</I> available in the set defined by the characters available in the string <I>char2</I> from the right until a character not in the set is encountered.<P>\n<B>Examples:</B>\n<PRE>\nSELECT RTRIM ( 'Text<=-=-=-' , '<-=' ) FROM DUAL;\n\nRTRI\n----\nText\n</PRE>
-Char to Char Functions:SOUNDEX ( char )=Returns a string that contains a phonetic representation of <I>char</I>. This is usefull for comparing strings that sound similarly, but are spelled different. The algorithm used is available in <I>The Art of Computer Programming, Volume 3: Sorting and Searching, by Donald E. Knuth</I>.<P>\n<B>Examples:</B>\n<PRE>\nSELECT 'Johnson sounds like Jonsson'\n FROM DUAL WHERE SOUNDEX ( 'Johnson' ) = SOUNDEX ( 'Jonsson' );\n\n'JOHNSONSOUNDSLIKEJONSSON'\n---------------------------\nJohnson sounds like Jonsson\n</PRE>
+Char to Char Functions:SOUNDEX ( char )=Returns a string that contains a phonetic representation of <I>char</I>. This is useful for comparing strings that sound similarly, but are spelled different. The algorithm used is available in <I>The Art of Computer Programming, Volume 3: Sorting and Searching, by Donald E. Knuth</I>.<P>\n<B>Examples:</B>\n<PRE>\nSELECT 'Johnson sounds like Jonsson'\n FROM DUAL WHERE SOUNDEX ( 'Johnson' ) = SOUNDEX ( 'Jonsson' );\n\n'JOHNSONSOUNDSLIKEJONSSON'\n---------------------------\nJohnson sounds like Jonsson\n</PRE>
Char to Char Functions:SUBSTR ( char , m , n )=This function returns a substring of of the <I>char</I> string. If <I>m</I> is 0 it is treated as 1 which means the beginning of the string, 2 meaning the second character etc. If <I>m</I> is negative it will count from the end of the string with -1 meaning the last character of the string. If <I>n</I> is not specified the rest of the string is returned.<P>\n<B>Examples:</B>\n<PRE>\nSELECT SUBSTR('Henrik P Johnson',8,3) FROM DUAL;\n\nSUB\n---\nP J\n</PRE>
Char to Char Functions:SUBSTRB ( char , m , n )=This function returns a substring of of the <I>char</I> string. The difference from <CODE>SUBSTR</CODE> is that this function counts bytes instead of characters which differs if you use multichar charactersets.<P>\n<B>Examples:</B><P>\nIf run on a UNICODE characterset database.\n<PRE>\nSELECT SUBSTRB('Henrik P Johnson',7,4) FROM DUAL;\n\nSU\n--\nri\n</PRE>
Char to Char Functions:TRANSLATE ( char , from , to )=This function will return a string where every occurance of a character in <I>char</I> is replaced from the character in <I>from</I> with the corresponding character in <I>to</I>. If the character is not available in <I>to</I> it is removed from the result.<P>\n<B>Example:</B>\n<PRE>\nSELECT TRANSLATE ( 'Mauritz' , 'Mauritz' , 'Henrik' ) FROM DUAL;\n\nTRANSL\n------\nHenrik\n</PRE>
Modified: trunk/tora/src/tobrowserindexwidget.cpp
===================================================================
--- trunk/tora/src/tobrowserindexwidget.cpp 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/tobrowserindexwidget.cpp 2010-03-30 12:48:44 UTC (rev 3482)
@@ -158,7 +158,7 @@
addTab(columnView, "&Columns");
if (toIsOracle(c) || toIsSapDB(c))
- addTab(resultInfo, "Informations");
+ addTab(resultInfo, "Information");
else
resultInfo->hide();
Modified: trunk/tora/src/toconnection.h
===================================================================
--- trunk/tora/src/toconnection.h 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/toconnection.h 2010-03-30 12:48:44 UTC (rev 3482)
@@ -874,16 +874,16 @@
*/
virtual QString description(bool version = true) const;
- /** Set if this connection needs to be commited.
+ /** Set if this connection needs to be committed.
*/
void setNeedCommit(bool needCommit = true)
{
NeedCommit = needCommit;
}
/**
- * Get information about if the connection has uncommited data.
+ * Get information about if the connection has uncommitted data.
*
- * @return Whether uncommited data is available.
+ * @return Whether uncommitted data is available.
*/
bool needCommit(void) const
{
@@ -1177,7 +1177,7 @@
/** Get a list of options available for the connection. An option with the name
* "-" indicates a break should be made to separate the rest of the options from the previous
- * options. An option preceeded by "*" means selected by default. The * shoul be stripped before
+ * options. An option preceded by "*" means selected by default. The * shoul be stripped before
* before passing it to the connection call.
*/
virtual std::list<QString> providedOptions(const QString &provider);
Modified: trunk/tora/src/todatabasesettingui.ui
===================================================================
--- trunk/tora/src/todatabasesettingui.ui 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/todatabasesettingui.ui 2010-03-30 12:48:44 UTC (rev 3482)
@@ -23,7 +23,7 @@
<item row="0" column="0">
<widget class="QCheckBox" name="AutoCommit">
<property name="toolTip">
- <string>Specify if changes should be automatically commited.</string>
+ <string>Specify if changes should be automatically committed.</string>
</property>
<property name="text">
<string>&Autocommit changes</string>
Modified: trunk/tora/src/todebug.cpp
===================================================================
--- trunk/tora/src/todebug.cpp 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/todebug.cpp 2010-03-30 12:48:44 UTC (rev 3482)
@@ -1067,7 +1067,7 @@
return ;
}
- // Check if current code has been modified in TOra and not commited to database.
+ // Check if current code has been modified in TOra and not committed to database.
// If so - force user to compile code.
if (!checkCompile())
return ;
Modified: trunk/tora/src/tohtml.cpp
===================================================================
--- trunk/tora/src/tohtml.cpp 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/tohtml.cpp 2010-03-30 12:48:44 UTC (rev 3482)
@@ -194,7 +194,7 @@
}
QualifierNum++;
if (QualifierNum >= TO_HTML_MAX_QUAL)
- throw qApp->translate("toHtml", "Exceded qualifier max in toHtml");
+ throw qApp->translate("toHtml", "Exceeded qualifier max in toHtml");
}
}
else
Modified: trunk/tora/src/tomain.h
===================================================================
--- trunk/tora/src/tomain.h 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/tomain.h 2010-03-30 12:48:44 UTC (rev 3482)
@@ -365,7 +365,7 @@
* @exception QString If connection wasn't found.
*/
toConnection &connection(const QString &);
- /** Set if a connection needs to be commited. Also updates visual feedback in interface.
+ /** Set if a connection needs to be committed. Also updates visual feedback in interface.
*/
void setNeedCommit(toConnection &conn, bool needCommit = true);
@@ -510,7 +510,7 @@
*/
void removedToolWidget(toToolWidget *tool);
/** Emitted before a commit or rollback is made to the current connection.
- * @param conn Connection that is commited
+ * @param conn Connection that is committed
* @param cmt True if commit, false if rollback.
*/
void willCommit(toConnection &conn, bool cmt);
Modified: trunk/tora/src/toresulttableviewedit.h
===================================================================
--- trunk/tora/src/toresulttableviewedit.h 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/toresulttableviewedit.h 2010-03-30 12:48:44 UTC (rev 3482)
@@ -201,7 +201,7 @@
/**
* Handle connection toolbar's commit and rollback.
*
- * @param conn Connection that is commited.
+ * @param conn Connection that is committed.
* @param cmt true for commit, false for rollback
*/
void commitChanges(toConnection &conn, bool cmt);
Modified: trunk/tora/src/tosql.h
===================================================================
--- trunk/tora/src/tosql.h 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/tosql.h 2010-03-30 12:48:44 UTC (rev 3482)
@@ -55,7 +55,7 @@
/**
* This class handles an abstraction of SQL statements used by TOra to extract
- * information and manipulate data. This is usefull in two ways, first off you
+ * information and manipulate data. This is useful in two ways, first off you
* can edit the strings using a handy editor inside TOra if you find bugs. Also
* you can use different statements for different Oracle versions. You can also
* add support for new versions of Oracle without any need for recompilation or
Modified: trunk/tora/src/ts_log/decorator.h
===================================================================
--- trunk/tora/src/ts_log/decorator.h 2010-03-29 16:35:49 UTC (rev 3481)
+++ trunk/tora/src/ts_log/decorator.h 2010-03-30 12:48:44 UTC (rev 3482)
@@ -158,7 +158,7 @@
/********************************************************************************
*
- * Some usefull decorators
+ * Some useful decorators
*
********************************************************************************/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2010-03-30 14:59:11
|
Revision: 3483
http://tora.svn.sourceforge.net/tora/?rev=3483&view=rev
Author: meskes
Date: 2010-03-30 14:59:04 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
Updated Debian files to latest version.
Modified Paths:
--------------
trunk/tora/ChangeLog
trunk/tora/debian/control
trunk/tora/debian/rules
trunk/tora/debian/tora.install
Removed Paths:
-------------
trunk/tora/debian/README.source
trunk/tora/debian/patches/00list
trunk/tora/debian/patches/03_README.LAYOUT.dpatch
Modified: trunk/tora/ChangeLog
===================================================================
--- trunk/tora/ChangeLog 2010-03-30 12:48:44 UTC (rev 3482)
+++ trunk/tora/ChangeLog 2010-03-30 14:59:04 UTC (rev 3483)
@@ -1,21 +1,27 @@
tora (2.1.2-1) unstable; urgency=low
- * Improved: Add editor option for uppler/lowercase object names
- * Improved: Db extract/compare tool now remembers widgets states
- * New: Filesystem completer for target line edit
- * Improved: Compatibility with sql+
- * New: Color/pixmap identifier for connection
- * Improved: Schema browser improvements
- * New: Ability to add external static check
- * New: Save package specification and body to one file
- * New: Initial support for creating/modifying tables
- * Bugfixes
+ * Added debug package. (Closes: #560064)
+ * New Upstream version 2.1.2
+ * Improved: Add editor option for uppler/lowercase object names
+ * Improved: Db extract/compare tool now remembers widgets states
+ * New: Filesystem completer for target line edit
+ * Improved: Compatibility with sql+
+ * New: Color/pixmap identifier for connection
+ * Improved: Schema browser improvements
+ * New: Ability to add external static check
+ * New: Save package specification and body to one file
+ * New: Initial support for creating/modifying tables
+ * Bugfixes
+ * Bumped Standards-Version to 3.8.4, no changes needed.
+ * No patches needed anymore, removed patch system.
+ -- Michael Meskes <me...@de...> Tue, 30 Mar 2010 13:14:16 +0200
+
tora (2.1.1-1) unstable; urgency=low
- * New upstream version
+ * New upstream version.
- -- Nathan Neulinger <nn...@ne...> Tue, 13 Oct 2009 13:44:40 -0600
+ -- Michael Meskes <me...@de...> Thu, 19 Nov 2009 15:18:19 +0100
tora (2.1.0-1) unstable; urgency=low
Deleted: trunk/tora/debian/README.source
===================================================================
--- trunk/tora/debian/README.source 2010-03-30 12:48:44 UTC (rev 3482)
+++ trunk/tora/debian/README.source 2010-03-30 14:59:04 UTC (rev 3483)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: trunk/tora/debian/control
===================================================================
--- trunk/tora/debian/control 2010-03-30 12:48:44 UTC (rev 3482)
+++ trunk/tora/debian/control 2010-03-30 14:59:04 UTC (rev 3483)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg...@li...>
Uploaders: Michael Meskes <me...@de...>
-Build-Depends: debhelper (>= 5), kdelibs5-dev, kdebase-bin, dpatch, libqscintilla2-dev, cdbs, libpq-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5), libqscintilla2-dev, cdbs, libpq-dev, cmake
+Standards-Version: 3.8.4
Homepage: http://www.torasql.com
Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/tora.git
Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/tora.git
@@ -17,3 +17,15 @@
storage manager, rollback segment monitor, instance manager, and SQL output
viewer. Via qt4 it can access PostgreSQL and MySQL directly. Any other
database systems can be accessed via ODBC.
+
+Package: tora-dbg
+Section: debug
+Architecture: any
+Depends: ${misc:Depends}, tora
+Description: A graphical toolkit for database developers and administrators - debugging symbols
+ Tora features a schema browser, SQL worksheet, PL/SQL editor & debugger,
+ storage manager, rollback segment monitor, instance manager, and SQL output
+ viewer. Via qt4 it can access PostgreSQL and MySQL directly. Any other
+ database systems can be accessed via ODBC.
+ .
+ This package provides the debugging symbols for tora.
Deleted: trunk/tora/debian/patches/00list
===================================================================
--- trunk/tora/debian/patches/00list 2010-03-30 12:48:44 UTC (rev 3482)
+++ trunk/tora/debian/patches/00list 2010-03-30 14:59:04 UTC (rev 3483)
@@ -1 +0,0 @@
-03_README.LAYOUT
Deleted: trunk/tora/debian/patches/03_README.LAYOUT.dpatch
===================================================================
--- trunk/tora/debian/patches/03_README.LAYOUT.dpatch 2010-03-30 12:48:44 UTC (rev 3482)
+++ trunk/tora/debian/patches/03_README.LAYOUT.dpatch 2010-03-30 14:59:04 UTC (rev 3483)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_README.LAYOUT.dpatch by Michael Meskes <me...@de...>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No such file README.LAYOUT
-
-@DPATCH@
-
-diff -ruN tora-2.0.0.orig/CMakeLists.txt tora-2.0.0/CMakeLists.txt
---- tora-2.0.0.orig/CMakeLists.txt 2008-11-03 21:32:20.000000000 +0100
-+++ tora-2.0.0/CMakeLists.txt 2009-01-03 21:29:48.000000000 +0100
-@@ -282,7 +282,6 @@
- README.BINARIES
- README.CMAKE
- README.CODESTYLE
-- README.LAYOUT
- README.LICENSE
- README.OSX
- README.RELEASE
Modified: trunk/tora/debian/rules
===================================================================
--- trunk/tora/debian/rules 2010-03-30 12:48:44 UTC (rev 3482)
+++ trunk/tora/debian/rules 2010-03-30 14:59:04 UTC (rev 3483)
@@ -2,28 +2,18 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-DEB_KDE_ENABLE_FINAL := yes
+DEB_DBG_PACKAGES := tora-dbg
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
- ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
- cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
- else
- cdbs_kde_enable_final =
- endif
-endif
-
install/tora::
# remove some file we don't want to install
- rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.OSX
- rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.LICENSE
- rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/README.WINDOWS
- rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/INSTALL
- rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/COPYING
- rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/ChangeLog
- rm -f $(CURDIR)/debian/tora/usr/share/doc/tora/changelog
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.OSX
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.LICENSE
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/README.WINDOWS
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/INSTALL
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/COPYING
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/ChangeLog
+ rm -f $(CURDIR)/debian/tmp/usr/share/doc/tora/changelog
# this file cannot be installed by dh_install because it has to be renamed
-install --owner root --group root --mode=644 $(CURDIR)/src/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm
# we have a desktop file
Modified: trunk/tora/debian/tora.install
===================================================================
--- trunk/tora/debian/tora.install 2010-03-30 12:48:44 UTC (rev 3482)
+++ trunk/tora/debian/tora.install 2010-03-30 14:59:04 UTC (rev 3483)
@@ -2,3 +2,6 @@
doc/help/images/*.png /usr/share/tora/help/images
src/icons/tora.xpm /usr/share/icons/hicolor/32x32/apps
+
+debian/tmp/usr/share/doc/tora/* /usr/share/doc/tora
+debian/tmp/usr/bin/tora /usr/bin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2010-03-30 15:44:23
|
Revision: 3484
http://tora.svn.sourceforge.net/tora/?rev=3484&view=rev
Author: tomasstraupis
Date: 2010-03-30 15:44:17 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
Up version to 2.1.3
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/configure.ac
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2010-03-30 14:59:04 UTC (rev 3483)
+++ trunk/tora/CMakeLists.txt 2010-03-30 15:44:17 UTC (rev 3484)
@@ -51,7 +51,7 @@
#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level)
SET (VERSION_MAJOR "2")
SET (VERSION_MINOR "1")
-SET (VERSION_PATCH "2")
+SET (VERSION_PATCH "3")
SET (VERSION_SUFFIX "")
SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
Modified: trunk/tora/configure.ac
===================================================================
--- trunk/tora/configure.ac 2010-03-30 14:59:04 UTC (rev 3483)
+++ trunk/tora/configure.ac 2010-03-30 15:44:17 UTC (rev 3484)
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT([tora],[2.1.2],[tor...@li...])
+AC_INIT([tora],[2.1.3],[tor...@li...])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
# Every other copy of the package version number gets its value from here
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2010-04-22 06:00:38
|
Revision: 3512
http://tora.svn.sourceforge.net/tora/?rev=3512&view=rev
Author: tomasstraupis
Date: 2010-04-22 06:00:32 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
Add configuration option to check/drop mySQL routines before creating them.
Modified Paths:
--------------
trunk/tora/doc/help/database.html
trunk/tora/doc/help/database.texi
trunk/tora/doc/help/images/mysql.png
trunk/tora/src/toconf.h
trunk/tora/src/toconfiguration.cpp
trunk/tora/src/toconfiguration.h
trunk/tora/src/toqsqlconnection.cpp
trunk/tora/src/toworksheet.cpp
trunk/tora/src/toworksheet.h
Modified: trunk/tora/doc/help/database.html
===================================================================
--- trunk/tora/doc/help/database.html 2010-04-22 03:22:29 UTC (rev 3511)
+++ trunk/tora/doc/help/database.html 2010-04-22 06:00:32 UTC (rev 3512)
@@ -99,6 +99,20 @@
<dl>
<dt><strong>Possibility to break MySql queries</strong><dd> TODO.
+<br><dt><strong>When calling create routine statement in worksheet</strong><dd> MySQL routine creation does not support "create or replace" therefore if you try to create new routine and it
+ already exists you will get an exception. This option controls if TOra should try to avoid such exceptions in
+ one of supported ways:
+ <ul>
+ <li><strong>Do nothing</strong> - do not try to detect and avoid exception when creating routines.
+ <li><strong>Drop before creating</strong> - execute "drop <procedure|function> if exists <name>" before calling create statement.
+ <li><strong>Drop before creating (if exists)</strong> - check routines table if routine already exists. If so - execute drop statement.
+ <li><strong>Ask</strong> - ask user if TOra should try dropping a routine before creating it (without checking if it already exists).
+ <li><strong>Ask (if exists)</strong> - check routines table if routine already exists. If so - ask user if drop
+ statement should be called (without it creating procedure will fail, but it could be usefull if you didn't know
+ that routine with given name exists already and now you would like to skip creation and probably change the name
+ of routine).
+ </ul>
+ <strong>Note!</strong> - if routine creation statement fails you will be left without <strong>any</strong> version of routine in the database!
</dl>
</body></html>
Modified: trunk/tora/doc/help/database.texi
===================================================================
--- trunk/tora/doc/help/database.texi 2010-04-22 03:22:29 UTC (rev 3511)
+++ trunk/tora/doc/help/database.texi 2010-04-22 06:00:32 UTC (rev 3512)
@@ -80,4 +80,19 @@
@table @asis
@item @strong{Possibility to break MySql queries}
TODO.
+@item @strong{When calling create routine statement in worksheet}
+ MySQL routine creation does not support "create or replace" therefore if you try to create new routine and it
+ already exists you will get an exception. This option controls if TOra should try to avoid such exceptions in
+ one of supported ways:
+ @itemize @bullet
+ @item @strong{Do nothing} - do not try to detect and avoid exception when creating routines.
+ @item @strong{Drop before creating} - execute "drop <procedure|function> if exists <name>" before calling create statement.
+ @item @strong{Drop before creating (if exists)} - check routines table if routine already exists. If so - execute drop statement.
+ @item @strong{Ask} - ask user if TOra should try dropping a routine before creating it (without checking if it already exists).
+ @item @strong{Ask (if exists)} - check routines table if routine already exists. If so - ask user if drop
+ statement should be called (without it creating procedure will fail, but it could be usefull if you didn't know
+ that routine with given name exists already and now you would like to skip creation and probably change the name
+ of routine).
+ @end itemize
+ @strong{Note!} - if routine creation statement fails you will be left without @strong{any} version of routine in the database!
@end table
Modified: trunk/tora/doc/help/images/mysql.png
===================================================================
(Binary files differ)
Modified: trunk/tora/src/toconf.h
===================================================================
--- trunk/tora/src/toconf.h 2010-04-22 03:22:29 UTC (rev 3511)
+++ trunk/tora/src/toconf.h 2010-04-22 06:00:32 UTC (rev 3512)
@@ -179,6 +179,8 @@
// tosqlconnection
#define CONF_ONLY_FORWARD "OnlyForward"
#define DEFAULT_ONLY_FORWARD true
+#define CONF_CREATE_ACTION "BeforeCreateAction"
+#define DEFAULT_CREATE_ACTION 0
// main.cpp
#define CONF_LAST_VERSION "LastVersion"
#define CONF_FIRST_INSTALL "FirstInstall"
Modified: trunk/tora/src/toconfiguration.cpp
===================================================================
--- trunk/tora/src/toconfiguration.cpp 2010-04-22 03:22:29 UTC (rev 3511)
+++ trunk/tora/src/toconfiguration.cpp 2010-04-22 06:00:32 UTC (rev 3512)
@@ -143,6 +143,7 @@
// toqsqlconnection
bool m_onlyForward;
+ int m_createAction;
// main.cpp
QString m_lastVersion;
@@ -386,6 +387,7 @@
m_maxLong = s.value(CONF_MAX_LONG, DEFAULT_MAX_LONG).toInt();
// toqsqlconnection
m_onlyForward = s.value(CONF_ONLY_FORWARD, DEFAULT_ONLY_FORWARD).toBool();
+ m_createAction = s.value(CONF_CREATE_ACTION, DEFAULT_CREATE_ACTION).toInt();
// main.cpp
m_lastVersion = s.value(CONF_LAST_VERSION, "").toString();
m_firstInstall = s.value(CONF_FIRST_INSTALL, "").toString();
@@ -614,6 +616,7 @@
s.setValue(CONF_MAX_LONG, m_maxLong);
// toqsqlconnection
s.setValue(CONF_ONLY_FORWARD, m_onlyForward);
+ s.setValue(CONF_CREATE_ACTION, m_createAction);
// main.cpp
s.setValue(CONF_LAST_VERSION, m_lastVersion);
s.setValue(CONF_FIRST_INSTALL, m_firstInstall);
@@ -1653,6 +1656,16 @@
p->m_onlyForward = v;
}
+int toConfiguration::createAction()
+{
+ return p->m_createAction;
+}
+
+void toConfiguration::setCreateAction(int v)
+{
+ p->m_createAction = v;
+}
+
// main.cpp
QString toConfiguration::lastVersion()
{
Modified: trunk/tora/src/toconfiguration.h
===================================================================
--- trunk/tora/src/toconfiguration.h 2010-04-22 03:22:29 UTC (rev 3511)
+++ trunk/tora/src/toconfiguration.h 2010-04-22 06:00:32 UTC (rev 3512)
@@ -284,6 +284,8 @@
// toqsqlconnection
bool onlyForward();
void setOnlyForward(bool v);
+ int createAction();
+ void setCreateAction(int v);
// main.cpp
QString lastVersion();
Modified: trunk/tora/src/toqsqlconnection.cpp
===================================================================
--- trunk/tora/src/toqsqlconnection.cpp 2010-04-22 03:22:29 UTC (rev 3511)
+++ trunk/tora/src/toqsqlconnection.cpp 2010-04-22 06:00:32 UTC (rev 3512)
@@ -1042,6 +1042,8 @@
class qSqlSetting : public QWidget, public toSettingTab
{
QCheckBox *OnlyForward;
+ QLabel *CreateLabel;
+ QComboBox *BeforeCreateAction;
public:
qSqlSetting(QWidget *parent)
: QWidget(parent), toSettingTab("database.html#qsql")
@@ -1069,6 +1071,22 @@
OnlyForward->setChecked(toConfigurationSingle::Instance().onlyForward());
vbox->addWidget(OnlyForward);
+ CreateLabel = new QLabel(
+ qApp->translate("qSqlSetting", "When calling create routine statement in worksheet"),
+ box);
+ vbox->addWidget(CreateLabel);
+
+ BeforeCreateAction = new QComboBox(box);
+ BeforeCreateAction->clear();
+ BeforeCreateAction->insertItems(0, QStringList()
+ << qApp->translate("qSqlSetting", "Do nothing")
+ << qApp->translate("qSqlSetting", "Drop before creating")
+ << qApp->translate("qSqlSetting", "Drop before creating (if exists)")
+ << qApp->translate("qSqlSetting", "Ask")
+ << qApp->translate("qSqlSetting", "Ask (if exists)"));
+ BeforeCreateAction->setCurrentIndex(toConfigurationSingle::Instance().createAction());
+ vbox->addWidget(BeforeCreateAction);
+
QSpacerItem *spacer = new QSpacerItem(
20,
20,
@@ -1082,6 +1100,7 @@
{
toConfigurationSingle::Instance().setOnlyForward(OnlyForward->isChecked());
toQSqlProvider::OnlyForward = OnlyForward->isChecked();
+ toConfigurationSingle::Instance().setCreateAction(BeforeCreateAction->currentIndex());
}
};
Modified: trunk/tora/src/toworksheet.cpp
===================================================================
--- trunk/tora/src/toworksheet.cpp 2010-04-22 03:22:29 UTC (rev 3511)
+++ trunk/tora/src/toworksheet.cpp 2010-04-22 06:00:32 UTC (rev 3512)
@@ -889,7 +889,8 @@
"select count(1)\n"
"from information_schema.routines\n"
"where routine_name = :f1<char[101]>\n"
- " and lower(routine_type) = :f2<char[101]>",
+ " and lower(routine_type) = :f2<char[101]>\n"
+ " and routine_schema = :f3<char[101]>",
"Check if routine exists in MySQL",
"5.0",
"MySQL");
@@ -900,6 +901,79 @@
"5.0",
"MySQL");
+// MySQL does not support replacing currently existing routines. Trying to create existing
+// routine raises exception. Therefore when creating a routine a previous one should be
+// dropped first.
+// There is a configuration option in MySQL settings section on how exactly this feature
+// should behave:
+// 0 - do nothing
+// 1 - drop before creating
+// 2 - drop before creating (if exists)
+// 3 - ask
+// 4 - ask (if exists)
+void toWorksheet::mySQLBeforeCreate(QString &chk)
+{
+ // wether routine exists must checked if config is set to 2 (drop if exists) and 4 (ask if exists)
+ bool check = (toConfigurationSingle::Instance().createAction() % 2 == 0);
+ // wether to ask or drop automatically if config is set to 3 (ask) and 4 (ask if exists)
+ bool ask = (toConfigurationSingle::Instance().createAction() > 2);
+ bool answerYes;
+
+ // do a "poor mans" parsing as we do not actually need to parse everything
+ chk.replace("(", " ");
+ chk.replace("\n", " ");
+ QStringList tok = chk.split(" ", QString::SkipEmptyParts);
+
+ // only for "create" statements
+ if (tok[0] == "create")
+ {
+ int i;
+ if (tok[1].startsWith("definer="))
+ i = 1;
+ else
+ i = 0;
+
+ // only for create function|procedure statements (not for create table|index etc...)
+ if (tok[1 + i] == "function" || tok[1 + i] == "procedure")
+ {
+ int c = 1; // count of existing routines (would logically be 0 or 1)
+
+ try {
+ if (check)
+ {
+ // Check if this routine actually exists in database
+ toQList param;
+ toPush(param, toQValue(tok[2 + i].remove('`'))); // routine name
+ toPush(param, toQValue(tok[1 + i])); // routine type (procedure or function)
+ toPush(param, toQValue(Schema->currentText()));
+ toQuery query(connection(), toQuery::Long, SQLCheckMySQLRoutine, param);
+ c = query.readValue().toInt(); // 1 - exists, 0 - does not exist
+ }
+
+ if (c == 1)
+ {
+ if (ask)
+ answerYes = (TOMessageBox::information(this, tr("Drop routine?"),
+ tr("Do you want to drop %1 %2?").arg(tok[1 + i]).arg(tok[2 + i]),
+ tr("&Drop"), tr("Leave it and continue")) == 0);
+ else
+ answerYes = true;
+
+ if (answerYes)
+ {
+ toQList param;
+ toPush(param, toQValue(tok[1 + i])); // routine type (procedure or function)
+ toPush(param, toQValue(tok[2 + i])); // routine name
+ // Note that if routine creation is not successfull you will be left without any routine!
+ toQuery query(connection(), toQuery::Long, SQLDropMySQLRoutine, param);
+ }
+ }
+ }
+ TOCATCH;
+ }
+ }
+} // mySQLBeforeCreate
+
void toWorksheet::query(const QString &str, execType type, toSQLParse::statement::statementClass sc)
{
Result->stop();
@@ -940,60 +1014,10 @@
if (chk.startsWith(QString::fromLatin1("create trigger ")))
nobinds = true;
- // MySQL does not support replacing currently existing routines. Trying to create existing
- // routine raises exception. Therefore when creating a routine a previous one should be
- // dropped first.
- if (toIsMySQL(connection()) && code)
- {
- // do a "poor mans" parsing as we do not actually need to parse everything
- chk.replace("(", " ");
- chk.replace("\n", " ");
- QStringList tok = chk.split(" ", QString::SkipEmptyParts);
+ // Imitate something like "create or replace" syntax for MySQL
+ if (toIsMySQL(connection()) && code && toConfigurationSingle::Instance().createAction() > 0)
+ mySQLBeforeCreate(chk);
- // only for "create" statements
- if (tok[0] == "create")
- {
- int i;
- if (tok[1].startsWith("definer="))
- i = 1;
- else
- i = 0;
-
- // only for create function|procedure statements (not for create table|index etc...)
- if (tok[1 + i] == "function" || tok[1 + i] == "procedure")
- {
- int c = 1; // count of existing routines (would logically be 0 or 1)
-
- try {
- if (1==1 /* config "check if routine exists" is enabled */)
- {
- // Check if this routine actually exists in database
- toQList param;
- toPush(param, toQValue(tok[2 + i].remove('`'))); // routine name
- toPush(param, toQValue(tok[1 + i])); // routine type (procedure or function)
- toQuery query(connection(), toQuery::Long, SQLCheckMySQLRoutine, param);
- c = query.readValue().toInt(); // 1 - exists, 0 - does not exist
- }
-
- if (c == 1 /*|| config "drop always" */)
- {
- if (TOMessageBox::information(this, tr("Drop routine?"),
- tr("Do you want to drop %1 %2?").arg(tok[1 + i]).arg(tok[2 + i]),
- tr("&Drop"), tr("Leave it and continue")) == 0)
- {
- toQList param;
- toPush(param, toQValue(tok[1 + i])); // routine type (procedure or function)
- toPush(param, toQValue(tok[2 + i])); // routine name
- // Note that if routine creation is not successfull you will be left without any routine!
- toQuery query(connection(), toQuery::Long, SQLDropMySQLRoutine, param);
- }
- }
- }
- TOCATCH;
- }
- }
- } // if toIsMySQL
-
if (type == OnlyPlan)
{
ResultTab->setCurrentIndex(ResultTab->indexOf(Plan));
Modified: trunk/tora/src/toworksheet.h
===================================================================
--- trunk/tora/src/toworksheet.h 2010-04-22 03:22:29 UTC (rev 3511)
+++ trunk/tora/src/toworksheet.h 2010-04-22 06:00:32 UTC (rev 3512)
@@ -183,6 +183,9 @@
// private for toworksheetwidget
toWorksheet(QWidget *parent, const char *name, toConnection &connection);
+ // Imitate something like "create or replace" syntax for MySQL
+ void mySQLBeforeCreate(QString &chk);
+
protected:
void closeEvent(QCloseEvent *event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2010-05-19 11:14:49
|
Revision: 3525
http://tora.svn.sourceforge.net/tora/?rev=3525&view=rev
Author: subik
Date: 2010-05-19 11:14:42 +0000 (Wed, 19 May 2010)
Log Message:
-----------
FindOracle.cmake is able to find various oracle libs on demand as modules. Behaviour for tora should be unchanged.
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/cmake/modules/FindOracle.cmake
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2010-05-17 09:11:49 UTC (rev 3524)
+++ trunk/tora/CMakeLists.txt 2010-05-19 11:14:42 UTC (rev 3525)
@@ -202,7 +202,7 @@
ADD_DEFINITIONS("-DTO_NO_ORACLE")
ELSE (NOT ENABLE_ORACLE)
- FIND_PACKAGE(Oracle)
+ FIND_PACKAGE(Oracle COMPONENTS CLNTSH XML)
IF(ORACLE_FOUND)
MESSAGE("Oracle OCI Library Found OK")
# what else is hidden in the ifdef hell?!
@@ -246,10 +246,10 @@
ADD_DEFINITIONS(-DHAVE_DB2)
ELSE (DB2_FOUND)
MESSAGE(" ")
- MESSAGE(WARNING " No DB2 client libraries have been found.")
- MESSAGE(WARNING " TOra can be build without it - without DB2 support.")
- MESSAGE(WARNING " Specify -DDB2_PATH_INCLUDES=path")
- MESSAGE(WARNING " and -DDB2_PATH_LIB=path manually")
+ MESSAGE(STATUS " No DB2 client libraries have been found.")
+ MESSAGE(STATUS " TOra can be build without it - without DB2 support.")
+ MESSAGE(STATUS " Specify -DDB2_PATH_INCLUDES=path")
+ MESSAGE(STATUS " and -DDB2_PATH_LIB=path manually")
MESSAGE(" ")
ENDIF (DB2_FOUND)
Modified: trunk/tora/cmake/modules/FindOracle.cmake
===================================================================
--- trunk/tora/cmake/modules/FindOracle.cmake 2010-05-17 09:11:49 UTC (rev 3524)
+++ trunk/tora/cmake/modules/FindOracle.cmake 2010-05-19 11:14:42 UTC (rev 3525)
@@ -4,6 +4,10 @@
# ORACLE_HAS_XML - Oracle has XDK support(thick client installed)
# ORACLE_INCLUDES - where to find oci.h
# ORACLE_LIBRARIES - the libraries to link against to use Oracle OCI
+#
+# Components: CLNTSH, OCCI, XML, OCIEI
+# CLNTSH is enabled by default
+# for example: FIND_PACKAGE(Oracle REQUIRED CLNTSH OCCI)
#
# copyright (c) 2007 Petr Vanek <pe...@sc...>
# copyright (c) 2009 Ivan Brezina <ibr...@ib...>
@@ -14,7 +18,26 @@
SET(ORACLE_HAS_XML "NO")
SET(ORACLE_HOME $ENV{ORACLE_HOME})
+# "components" handling. It enables to find various independent libraries,
+IF( Oracle_FIND_COMPONENTS )
+ FOREACH( component ${Oracle_FIND_COMPONENTS} )
+ STRING( TOUPPER ${component} _COMPONENT )
+ SET( ORACLE_USE_${_COMPONENT} 1 )
+ ENDFOREACH( component )
+ # legacy behaviour
+ IF (NOT ORACLE_USE_CLNTSH)
+ SET(ORACLE_USE_CLNTSH 1)
+ ENDIF (NOT ORACLE_USE_CLNTSH)
+
+ # it looks like it's mandatory on macosx
+ IF (APPLE)
+ SET(ORACLE_USE_OCIEI 1)
+ ENDIF (APPLE)
+
+ENDIF( Oracle_FIND_COMPONENTS )
+
+
IF (ORACLE_PATH_INCLUDES)
SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES})
ELSE (ORACLE_PATH_INCLUDES)
@@ -49,46 +72,71 @@
NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
)
-FIND_PATH(
- ORACLE_INCLUDES_XML
- xml.h
- ${ORACLE_INCLUDES_LOCATION}
- NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
-)
+SET(FORCE_ERROR 0)
-FIND_LIBRARY(
- ORACLE_LIBRARY_CLNTSH
- NAMES libclntsh clntsh oci
- PATHS ${ORACLE_LIB_LOCATION}
- NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
-)
+IF (ORACLE_USE_CLNTSH)
+ FIND_LIBRARY(
+ ORACLE_LIBRARY_CLNTSH
+ NAMES libclntsh clntsh oci
+ PATHS ${ORACLE_LIB_LOCATION}
+ NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
+ )
+ IF (NOT ORACLE_LIBRARY_CLNTSH AND Oracle_FIND_REQUIRED)
+ SET(FORCE_ERROR "CLNTSH")
+ ENDIF (NOT ORACLE_LIBRARY_CLNTSH AND Oracle_FIND_REQUIRED)
+ENDIF (ORACLE_USE_CLNTSH)
-FIND_LIBRARY(
- ORACLE_LIBRARY_XML
- NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11
- PATHS ${ORACLE_LIB_LOCATION}
- NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
-)
-SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH})
+IF (ORACLE_USE_OCCI)
+ FIND_LIBRARY(
+ ORACLE_LIBRARY_OCCI
+ NAMES libocci occi
+ PATHS ${ORACLE_LIB_LOCATION}
+ NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
+ )
+ IF (NOT ORACLE_LIBRARY_OCCI AND Oracle_FIND_REQUIRED)
+ SET(FORCE_ERROR "OCCI")
+ ENDIF (NOT ORACLE_LIBRARY_OCCI AND Oracle_FIND_REQUIRED)
+ENDIF (ORACLE_USE_OCCI)
-IF (APPLE)
+IF (ORACLE_USE_XML)
+ FIND_PATH(
+ ORACLE_INCLUDES_XML
+ xml.h
+ ${ORACLE_INCLUDES_LOCATION}
+ NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
+ )
+ IF (NOT ORACLE_INCLUDES_XML AND Oracle_FIND_REQUIRED)
+ SET(FORCE_ERROR "XML")
+ ENDIF (NOT ORACLE_INCLUDES_XML AND Oracle_FIND_REQUIRED)
+
+ FIND_LIBRARY(
+ ORACLE_LIBRARY_XML
+ NAMES libxml xml libxml10 xml10 libxml11 xml11 oraxml10 oraxml11
+ PATHS ${ORACLE_LIB_LOCATION}
+ NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
+ )
+ IF (NOT ORACLE_LIBRARY_XML AND Oracle_FIND_REQUIRED)
+ SET(FORCE_ERROR "XML")
+ ENDIF (NOT ORACLE_LIBRARY_XML AND Oracle_FIND_REQUIRED)
+ENDIF (ORACLE_USE_XML)
+
+IF (ORACLE_USE_OCIEI)
FIND_LIBRARY(ORACLE_LIBRARY_OCIEI
NAMES libociei ociei
PATHS ${ORACLE_LIB_LOCATION}
+ NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
)
- MESSAGE(STATUS "Searching for libociei: ${ORACLE_LIBRARY_OCIEI} in ${ORACLE_LIB_LOCATION}")
- IF (ORACLE_LIBRARY_OCIEI)
- LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_OCIEI})
- ELSE (ORACLE_LIBRARY_OCIEI)
- MESSAGE(STATUS "libociei.dylib is not found. Maybe it will cause crashes if you are building BUNDLE")
- ENDIF (ORACLE_LIBRARY_OCIEI)
-ENDIF (APPLE)
+ IF (NOT ORACLE_LIBRARY_OCIEI AND Oracle_FIND_REQUIRED)
+ SET(FORCE_ERROR "OCIEI")
+ ENDIF (NOT ORACLE_LIBRARY_OCIEI AND Oracle_FIND_REQUIRED)
+ENDIF (ORACLE_USE_OCIEI)
-IF (ORACLE_LIBRARY_XML)
- LIST(APPEND ORACLE_LIBRARY ${ORACLE_LIBRARY_XML})
-ENDIF (ORACLE_LIBRARY_XML)
+IF (NOT FORCE_ERROR)
+ SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_XML} ${ORACLE_LIBRARY_OCIEI})
+ENDIF (NOT FORCE_ERROR)
+
IF (ORACLE_INCLUDES AND ORACLE_LIBRARY)
SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY})
SET(ORACLE_FOUND "YES")
@@ -128,12 +176,10 @@
ENDIF (NOT DEFINED ORACLE_OCI_VERSION AND ORACLE_INCLUDES)
MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')")
+MESSAGE(STATUS " includes: ${ORACLE_INCLUDES}")
MESSAGE(STATUS "Found XML Oracle: ${ORACLE_INCLUDES_XML} ${ORACLE_LIBRARY_XML}")
+
IF (ORACLE_FOUND)
- IF (NOT ORACLE_FIND_QUIETLY)
- MESSAGE(STATUS "Found Oracle: ${ORACLE_LIBRARY} (ORACLE_HOME='${ORACLE_HOME}')")
- MESSAGE(STATUS " ${ORACLE_INCLUDES}")
- ENDIF (NOT ORACLE_FIND_QUIETLY)
# there *must* be OCI version defined for internal libraries
IF (ORACLE_OCI_VERSION)
ADD_DEFINITIONS(-DOTL_ORA${ORACLE_OCI_VERSION})
@@ -142,15 +188,21 @@
ENDIF (ORACLE_OCI_VERSION)
ELSE (ORACLE_FOUND)
+
MESSAGE(STATUS "Oracle not found.")
MESSAGE(STATUS "Oracle: You can specify includes: -DORACLE_PATH_INCLUDES=/usr/include/oracle/10.2.0.3/client")
MESSAGE(STATUS " currently found includes: ${ORACLE_INCLUDES}")
MESSAGE(STATUS "Oracle: You can specify libs: -DORACLE_PATH_LIB=/usr/lib/oracle/10.2.0.3/client/lib")
MESSAGE(STATUS " currently found libs: ${ORACLE_LIBRARY}")
- IF (ORACLE_FIND_REQUIRED)
+
+ IF (FORCE_ERROR)
+ MESSAGE(STATUS "Failed module info: ${FORCE_ERROR}")
+ ENDIF (FORCE_ERROR)
+ IF (Oracle_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Oracle library")
- ELSE (ORACLE_FIND_REQUIRED)
+ ELSE (Oracle_FIND_REQUIRED)
# setup the variables for silent continue
SET (ORACLE_INCLUDES "")
- ENDIF (ORACLE_FIND_REQUIRED)
+ ENDIF (Oracle_FIND_REQUIRED)
+
ENDIF (ORACLE_FOUND)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mrj...@us...> - 2010-06-07 02:34:58
|
Revision: 3564
http://tora.svn.sourceforge.net/tora/?rev=3564&view=rev
Author: mrjohnson0
Date: 2010-06-07 02:34:52 +0000 (Mon, 07 Jun 2010)
Log Message:
-----------
add teradata support, tested on windows so far
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/src/CMakeLists.txt
Added Paths:
-----------
trunk/tora/cmake/modules/FindTeradata.cmake
trunk/tora/cmake/modules/TeradataTest.c
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2010-06-07 02:32:06 UTC (rev 3563)
+++ trunk/tora/CMakeLists.txt 2010-06-07 02:34:52 UTC (rev 3564)
@@ -7,6 +7,7 @@
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." OFF)
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)
@@ -126,12 +127,7 @@
#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")
-ELSE(WANT_DEBUG)
SET(CMAKE_BUILD_TYPE RELEASE)
-ENDIF(WANT_DEBUG)
# Lets disable Wall warnings due the MSVC too much talkative
@@ -140,6 +136,7 @@
# MSVC, MSVC_IDE, MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
IF (MSVC)
SET (CXX_WARNINGS "")
+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
ELSE (MSVC)
SET (CXX_WARNINGS "-Wall")
ENDIF (MSVC)
@@ -151,7 +148,6 @@
SET(CMAKE_C_FLAGS_RELEASE "/DQSCINTILLA_DLL ${CMAKE_C_FLAGS_RELEASE}")
ENDIF (WIN32 AND NOT DEFINED WANT_INTERNAL_QSCINTILLA)
-
##############################################################################################################
########## Find Dependencies ##########
@@ -256,6 +252,16 @@
ENDIF (NOT ENABLE_DB2)
+IF (NOT ENABLE_TERADATA)
+ MESSAGE(STATUS "Teradata support disabled (enable with -DENABLE_TERADATA=on)")
+ELSE (NOT ENABLE_TERADATA)
+ FIND_PACKAGE(TERADATA)
+ IF (TERADATA_FOUND)
+ MESSAGE(STATUS "Teradata found")
+ ENDIF (TERADATA_FOUND)
+ENDIF (NOT ENABLE_TERADATA)
+
+
##############################################################################################################
########## Include Setup ##########
Added: trunk/tora/cmake/modules/FindTeradata.cmake
===================================================================
--- trunk/tora/cmake/modules/FindTeradata.cmake (rev 0)
+++ trunk/tora/cmake/modules/FindTeradata.cmake 2010-06-07 02:34:52 UTC (rev 3564)
@@ -0,0 +1,52 @@
+# FindTeradata.cmake
+
+SET(TERADATA_FOUND "NO")
+
+MESSAGE(STATUS "Looking for Teradata...")
+
+IF (NOT TERADATA_PATH_LIB)
+ MESSAGE(FATAL_ERROR "Please set path to cliv2 LIBRARIES with -DTERADATA_PATH_LIB")
+ENDIF (NOT TERADATA_PATH_LIB)
+
+IF (NOT TERADATA_PATH_INCLUDES)
+ MESSAGE(FATAL_ERROR "Please set path to cliv2 INCLUDES with -DTERADATA_PATH_INCLUDES")
+ENDIF (NOT TERADATA_PATH_INCLUDES)
+
+FIND_LIBRARY(
+ TERADATA_LIBRARY_LIBCLIV2
+ NAMES libcliv2 wincli32
+ PATHS ${TERADATA_PATH_LIB}
+)
+
+FIND_LIBRARY(
+ TERADATA_LIBRARY_LIBTDUSR
+ NAMES libtdusr
+ PATHS ${TERADATA_LIBRARY_LIBTDUSR}
+)
+
+SET (TERADATA_LIBRARIES "${TERADATA_LIBRARY_LIBCLIV2}")
+# teradata doesn't distribute a .lib for this one on windows
+IF (TERADATA_LIBRARY_LIBTDUSR)
+ SET (TERADATA_LIBRARIES "${TERADATA_LIBRARIES} ${TERADATA_LIBRARY_LIBTDUSR}")
+ENDIF (TERADATA_LIBRARY_LIBTDUSR)
+
+MESSAGE(STATUS "Teradata Libraries: ${TERADATA_LIBRARIES}")
+
+#TRY_RUN(TDRUNRESULT TDCOMPILERESULT
+# ${CMAKE_BINARY_DIR}
+# ${CMAKE_SOURCE_DIR}/cmake/modules/TeradataTest.c
+# CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${TERADATA_PATH_INCLUDES}"
+# OUTPUT_VARIABLE TDOUTPUTVAR)
+
+#IF (NOT TDCOMPILERESULT)
+# MESSAGE(STATUS "Compile Result: ${TDCOMPILERESULT}")
+# MESSAGE(STATUS "Run Result: ${TDRUNRESULT}")
+# MESSAGE(STATUS "Output: ${TDOUTPUTVAR}")
+# MESSAGE(FATAL_ERROR "Failed to run a simple Teradata compile test. Please double-check TERADATA_PATH_LIB and TERADATA_PATH_INCLUDES are set correctly.")
+#ENDIF (NOT TDCOMPILERESULT)
+
+IF (NOT TERADATA_LIBRARIES)
+ SET(TERADATA_LIBRARIES "${TERADATA_PATH_LIB} ${TERADATA_LIBRARY_LIBTDUSR}")
+ENDIF (NOT TERADATA_LIBRARIES)
+
+SET(TERADATA_FOUND "YES")
Property changes on: trunk/tora/cmake/modules/FindTeradata.cmake
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/tora/cmake/modules/TeradataTest.c
===================================================================
--- trunk/tora/cmake/modules/TeradataTest.c (rev 0)
+++ trunk/tora/cmake/modules/TeradataTest.c 2010-06-07 02:34:52 UTC (rev 3564)
@@ -0,0 +1,19 @@
+#include <stdlib.h>
+
+#include <coptypes.h> /* Teradata include files */
+#include <coperr.h>
+#include <dbcarea.h>
+#include <parcel.h>
+#include <dbchqep.h>
+
+int main(int c, char **v) {
+ static Int32 result;
+ static char cnta[4];
+ struct DBCAREA *dbcp;
+
+ dbcp = (DBCAREA *) malloc(sizeof(struct DBCAREA));
+ dbcp->total_len = sizeof(struct DBCAREA);
+ DBCHINI(&result,cnta, dbcp);
+
+ return 0;
+}
Property changes on: trunk/tora/cmake/modules/TeradataTest.c
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt 2010-06-07 02:32:06 UTC (rev 3563)
+++ trunk/tora/src/CMakeLists.txt 2010-06-07 02:34:52 UTC (rev 3564)
@@ -438,6 +438,11 @@
db2/db2query.cpp)
#db2/qsql_db2.cpp)
ENDIF (DB2_FOUND)
+
+IF (TERADATA_FOUND)
+ LIST (APPEND TORA_SOURCES toteradataconnection.cpp)
+ENDIF (TERADATA_FOUND)
+
# compiled in icons for windows
IF (WIN32 AND MSVC)
SET (TORA_SOURCES ${TORA_SOURCES} tora.rc)
@@ -500,6 +505,10 @@
INCLUDE_DIRECTORIES( ${DB2_INCLUDES} )
ENDIF (DB2_INCLUDES)
+IF (TERADATA_PATH_INCLUDES)
+ INCLUDE_DIRECTORIES( ${TERADATA_PATH_INCLUDES} )
+ENDIF (TERADATA_PATH_INCLUDES)
+
IF (WANT_INTERNAL_QSCINTILLA)
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/qscintilla2/Qt4
@@ -567,6 +576,10 @@
TARGET_LINK_LIBRARIES (${EXE_NAME} ${DB2_LIBRARIES})
ENDIF (DB2_LIBRARIES)
+IF (TERADATA_LIBRARIES)
+ TARGET_LINK_LIBRARIES (${EXE_NAME} ${TERADATA_LIBRARIES})
+ENDIF (TERADATA_LIBRARIES)
+
IF (USE_TROTL)
SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES COMPILE_FLAGS "-DTROTL_DLL")
TARGET_LINK_LIBRARIES (${EXE_NAME} ${TROTL_LIB})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nn...@us...> - 2010-06-18 15:35:45
|
Revision: 3575
http://tora.svn.sourceforge.net/tora/?rev=3575&view=rev
Author: nneul
Date: 2010-06-18 15:35:38 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
add some documentation notes
Modified Paths:
--------------
trunk/tora/README
trunk/tora/README.RELEASE
Modified: trunk/tora/README
===================================================================
--- trunk/tora/README 2010-06-18 15:14:15 UTC (rev 3574)
+++ trunk/tora/README 2010-06-18 15:35:38 UTC (rev 3575)
@@ -48,6 +48,12 @@
TOra is supported for running with an Oracle 8.1.7 or newer
client installation. It has been verified to work with Oracle 10g and 11g.
+WINDOWS / ORACLE NOTICE: The windows build of tora includes a stub Oracle DLL to
+enable the product to work with other database engines even if oracle is not
+installed. If you have Oracle client installed, and want oracle support in TOra to
+function, remove the oci.dll file from the TOra installation directory after
+installing it.
+
In addition, TOra also supports postgres and mysql if your Qt library
is compiled with that support.
Modified: trunk/tora/README.RELEASE
===================================================================
--- trunk/tora/README.RELEASE 2010-06-18 15:14:15 UTC (rev 3574)
+++ trunk/tora/README.RELEASE 2010-06-18 15:35:38 UTC (rev 3575)
@@ -28,6 +28,8 @@
scp tora-$VER.tar.gz $USR,to...@fr...:/home/frs/project/t/to/tora/tora/$VER/
+For each uploaded release source tarball or binary, also upload a .md5sum and .sha1sum file for
+the upload in the same directory.
add new release to the 'tora' package
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2010-07-16 08:56:53
|
Revision: 3629
http://tora.svn.sourceforge.net/tora/?rev=3629&view=rev
Author: subik
Date: 2010-07-16 08:56:47 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
compilation for for new qt
Modified Paths:
--------------
trunk/tora/README.CMAKE
trunk/tora/src/tooracleconnection.cpp
trunk/tora/src/tooracleconnection_trotl.cpp
trunk/tora/src/toteradataconnection.cpp
Modified: trunk/tora/README.CMAKE
===================================================================
--- trunk/tora/README.CMAKE 2010-07-14 10:52:52 UTC (rev 3628)
+++ trunk/tora/README.CMAKE 2010-07-16 08:56:47 UTC (rev 3629)
@@ -9,6 +9,11 @@
where "build_dir" can be e.g.: . for TOra source root directory
or manually created directory to keep build files out of SVN copy.
+Make targets:
+ * make
+ * make install
+ * make dist
+
Options:
Cmake installs TOra into /usr/local as default. You can change it
Modified: trunk/tora/src/tooracleconnection.cpp
===================================================================
--- trunk/tora/src/tooracleconnection.cpp 2010-07-14 10:52:52 UTC (rev 3628)
+++ trunk/tora/src/tooracleconnection.cpp 2010-07-16 08:56:47 UTC (rev 3629)
@@ -898,7 +898,7 @@
{
// Ignore any errors here
}
- return QString::QString();
+ return QString();
}
virtual toQuery::queryImpl *createQuery(toQuery *query, toConnectionSub *sub)
Modified: trunk/tora/src/tooracleconnection_trotl.cpp
===================================================================
--- trunk/tora/src/tooracleconnection_trotl.cpp 2010-07-14 10:52:52 UTC (rev 3628)
+++ trunk/tora/src/tooracleconnection_trotl.cpp 2010-07-16 08:56:47 UTC (rev 3629)
@@ -761,7 +761,7 @@
TLOG(1,toDecorator,__HERE__) << " Ignored exception." << std::endl;
// Ignore any errors here
}
- return QString::QString();
+ return QString();
}
virtual toQuery::queryImpl *createQuery(toQuery *query, toConnectionSub *sub)
Modified: trunk/tora/src/toteradataconnection.cpp
===================================================================
--- trunk/tora/src/toteradataconnection.cpp 2010-07-14 10:52:52 UTC (rev 3628)
+++ trunk/tora/src/toteradataconnection.cpp 2010-07-16 08:56:47 UTC (rev 3629)
@@ -1441,7 +1441,7 @@
{
// Ignore any errors here
}
- return QString::QString();
+ return QString();
}
virtual toQuery::queryImpl *createQuery(toQuery *query, toConnectionSub *sub)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2010-07-18 11:29:12
|
Revision: 3632
http://tora.svn.sourceforge.net/tora/?rev=3632&view=rev
Author: tomasstraupis
Date: 2010-07-18 11:29:05 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
Add documentation information about exporting list data to files.
Modified Paths:
--------------
trunk/tora/doc/help/Index_002dlist.html
trunk/tora/doc/help/additionalhelp.html
trunk/tora/doc/help/alert.html
trunk/tora/doc/help/analyze.html
trunk/tora/doc/help/api.html
trunk/tora/doc/help/browser.html
trunk/tora/doc/help/charts.html
trunk/tora/doc/help/common.html
trunk/tora/doc/help/current.html
trunk/tora/doc/help/database.html
trunk/tora/doc/help/debugger.html
trunk/tora/doc/help/editor.html
trunk/tora/doc/help/editors.html
trunk/tora/doc/help/explainplan.html
trunk/tora/doc/help/extendingtora.html
trunk/tora/doc/help/externalapi.html
trunk/tora/doc/help/gettingbindparameters.html
trunk/tora/doc/help/globalsettings.html
trunk/tora/doc/help/help.html
trunk/tora/doc/help/history.html
trunk/tora/doc/help/index.html
trunk/tora/doc/help/invalid.html
trunk/tora/doc/help/lists.html
trunk/tora/doc/help/lists.texi
trunk/tora/doc/help/memoeditor.html
trunk/tora/doc/help/newconnection.html
trunk/tora/doc/help/objectdescription.html
trunk/tora/doc/help/output.html
trunk/tora/doc/help/plsqleditor.html
trunk/tora/doc/help/preferences.html
trunk/tora/doc/help/rollback.html
trunk/tora/doc/help/script.html
trunk/tora/doc/help/searchreplace.html
trunk/tora/doc/help/security.html
trunk/tora/doc/help/session.html
trunk/tora/doc/help/sgastatement.html
trunk/tora/doc/help/sqledit.html
trunk/tora/doc/help/storage.html
trunk/tora/doc/help/template.html
trunk/tora/doc/help/tools.html
trunk/tora/doc/help/toolsetting.html
trunk/tora/doc/help/tora.texi
trunk/tora/doc/help/trace.html
trunk/tora/doc/help/tuning.html
trunk/tora/doc/help/unittest.html
trunk/tora/doc/help/whatprivileges.html
trunk/tora/doc/help/window.html
trunk/tora/doc/help/worksheet.html
trunk/tora/doc/help/workspace.html
trunk/tora/src/tora.qrc
Added Paths:
-----------
trunk/tora/doc/help/images/exporttofile.png
trunk/tora/src/help/images/exporttofile.png
Modified: trunk/tora/doc/help/Index_002dlist.html
===================================================================
--- trunk/tora/doc/help/Index_002dlist.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/Index_002dlist.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -8,7 +8,7 @@
<link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/additionalhelp.html
===================================================================
--- trunk/tora/doc/help/additionalhelp.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/additionalhelp.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="toolsetting.html#toolsetting" title="toolsetting">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/alert.html
===================================================================
--- trunk/tora/doc/help/alert.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/alert.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="invalid.html#invalid" title="invalid">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/analyze.html
===================================================================
--- trunk/tora/doc/help/analyze.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/analyze.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="alert.html#alert" title="alert">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/api.html
===================================================================
--- trunk/tora/doc/help/api.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/api.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="externalapi.html#externalapi" title="externalapi">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/browser.html
===================================================================
--- trunk/tora/doc/help/browser.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/browser.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="plsqleditor.html#plsqleditor" title="plsqleditor">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/charts.html
===================================================================
--- trunk/tora/doc/help/charts.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/charts.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="searchreplace.html#searchreplace" title="searchreplace">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/common.html
===================================================================
--- trunk/tora/doc/help/common.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/common.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="prev" href="preferences.html#preferences" title="preferences">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/current.html
===================================================================
--- trunk/tora/doc/help/current.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/current.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="script.html#script" title="script">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/database.html
===================================================================
--- trunk/tora/doc/help/database.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/database.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="additionalhelp.html#additionalhelp" title="additionalhelp">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/debugger.html
===================================================================
--- trunk/tora/doc/help/debugger.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/debugger.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="unittest.html#unittest" title="unittest">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/editor.html
===================================================================
--- trunk/tora/doc/help/editor.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/editor.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="database.html#database" title="database">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/editors.html
===================================================================
--- trunk/tora/doc/help/editors.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/editors.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="lists.html#lists" title="lists">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/explainplan.html
===================================================================
--- trunk/tora/doc/help/explainplan.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/explainplan.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="gettingbindparameters.html#gettingbindparameters" title="gettingbindparameters">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/extendingtora.html
===================================================================
--- trunk/tora/doc/help/extendingtora.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/extendingtora.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="Index_002dlist.html#Index_002dlist" title="Index-list">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/externalapi.html
===================================================================
--- trunk/tora/doc/help/externalapi.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/externalapi.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="prev" href="api.html#api" title="api">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/gettingbindparameters.html
===================================================================
--- trunk/tora/doc/help/gettingbindparameters.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/gettingbindparameters.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="objectdescription.html#objectdescription" title="objectdescription">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/globalsettings.html
===================================================================
--- trunk/tora/doc/help/globalsettings.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/globalsettings.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="editor.html#editor" title="editor">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/help.html
===================================================================
--- trunk/tora/doc/help/help.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/help.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="history.html#history" title="history">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/history.html
===================================================================
--- trunk/tora/doc/help/history.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/history.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="workspace.html#workspace" title="workspace">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Added: trunk/tora/doc/help/images/exporttofile.png
===================================================================
(Binary files differ)
Property changes on: trunk/tora/doc/help/images/exporttofile.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/tora/doc/help/index.html
===================================================================
--- trunk/tora/doc/help/index.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/index.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -7,7 +7,7 @@
<link title="Top" rel="start" href="#Top">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
@@ -26,7 +26,7 @@
<div class="contents">
<h2>Table of Contents</h2>
<ul>
-<li><a name="toc_Top" href="index.html#Top">TOra Manual 2.1.2+</a>
+<li><a name="toc_Top" href="index.html#Top">TOra Manual 2.1.3+</a>
<li><a name="toc_help" href="help.html#help">1 Using the help browser</a>
<li><a name="toc_history" href="history.html#history">2 History of TOra</a>
<li><a name="toc_workspace" href="workspace.html#workspace">3 Getting to know your workspace</a>
@@ -96,9 +96,9 @@
<hr>
</div>
-<h2 class="unnumbered">TOra Manual 2.1.2+</h2>
+<h2 class="unnumbered">TOra Manual 2.1.3+</h2>
-<p>This manual is for TOra, version 2.1.2+.
+<p>This manual is for TOra, version 2.1.3+.
<ul class="menu">
<li><a accesskey="1" href="help.html#help">Using the help browser</a>
Modified: trunk/tora/doc/help/invalid.html
===================================================================
--- trunk/tora/doc/help/invalid.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/invalid.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="output.html#output" title="output">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/lists.html
===================================================================
--- trunk/tora/doc/help/lists.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/lists.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="charts.html#charts" title="charts">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
@@ -66,6 +66,26 @@
<p>You can also place a line in the bind parameter(see <a href="gettingbindparameters.html#gettingbindparameters">gettingbindparameters</a>) cache by double clicking on a line. The bind name will be the same as the column name in lowercase.
+<h4 class="subheading">Exporting the contents of a list</h4>
+
+<p>Contents of a list can be exported by choosing an "Export to file..." item from a context menu. This will give you a following dialog:
+
+ <div class="block-image"><img src="images/exporttofile.png" alt="images/exporttofile.png"></div>
+
+ <p>TOra allows you to export data in a number of formats:
+
+ <ul>
+<li><strong>Text</strong> - simple text file will be created with values in different columns separated by a required number of spaces.
+<li><strong>Tab delimited</strong> - same as text just columns will be separated with a tab character.
+<li><strong>CSV</strong> - values will be exported with a specified separator used.
+<li><strong>Html</strong> - a html file be created with a single table containing values of a list.
+<li><strong>SQL</strong> - a sql file will be created containing insert statements for values chosen.
+</ul>
+
+ <p>Please note that this functionality can be called from schema browser as well as from a sql worksheet tool. When exporting to sql file, only calling from schema browser tool will produce an insert statements with a correct table name. SQL Worksheet does not now exactly data of which table you're exporting (you could be exporting from a number of tables) therefore TOra will put "tablename" instead of actual name of table when exporting from SQL worksheet. Do not forget to update it in resulting sql file!
+
+ <p>Case of keywords in insert statement can be controlled via configuration option "Keywords upper" found in editore preferences.
+
<h4 class="subheading">Other list functionality</h4>
<p>Lists can always be printed by selecting the <strong>File|Print</strong> menu item.
Modified: trunk/tora/doc/help/lists.texi
===================================================================
--- trunk/tora/doc/help/lists.texi 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/lists.texi 2010-07-18 11:29:05 UTC (rev 3632)
@@ -31,6 +31,26 @@
You can also place a line in the bind parameter(@pxref{gettingbindparameters}) cache by double clicking on a line. The bind name will be the same as the column name in lowercase.
+@subheading Exporting the contents of a list
+
+Contents of a list can be exported by choosing an "Export to file..." item from a context menu. This will give you a following dialog:
+
+@image{images/exporttofile}
+
+TOra allows you to export data in a number of formats:
+
+@itemize @bullet
+@item @strong{Text} - simple text file will be created with values in different columns separated by a required number of spaces.
+@item @strong{Tab delimited} - same as text just columns will be separated with a tab character.
+@item @strong{CSV} - values will be exported with a specified separator used.
+@item @strong{Html} - a html file be created with a single table containing values of a list.
+@item @strong{SQL} - a sql file will be created containing insert statements for values chosen.
+@end itemize
+
+Please note that this functionality can be called from schema browser as well as from a sql worksheet tool. When exporting to sql file, only calling from schema browser tool will produce an insert statements with a correct table name. SQL Worksheet does not now exactly data of which table you're exporting (you could be exporting from a number of tables) therefore TOra will put "tablename" instead of actual name of table when exporting from SQL worksheet. Do not forget to update it in resulting sql file!
+
+Case of keywords in insert statement can be controlled via configuration option "Keywords upper" found in editore preferences.
+
@subheading Other list functionality
Lists can always be printed by selecting the @strong{File|Print} menu item.
Modified: trunk/tora/doc/help/memoeditor.html
===================================================================
--- trunk/tora/doc/help/memoeditor.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/memoeditor.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="prev" href="objectdescription.html#objectdescription" title="objectdescription">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/newconnection.html
===================================================================
--- trunk/tora/doc/help/newconnection.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/newconnection.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="whatprivileges.html#whatprivileges" title="whatprivileges">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/objectdescription.html
===================================================================
--- trunk/tora/doc/help/objectdescription.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/objectdescription.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="memoeditor.html#memoeditor" title="memoeditor">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/output.html
===================================================================
--- trunk/tora/doc/help/output.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/output.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="template.html#template" title="template">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/plsqleditor.html
===================================================================
--- trunk/tora/doc/help/plsqleditor.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/plsqleditor.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="debugger.html#debugger" title="debugger">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/preferences.html
===================================================================
--- trunk/tora/doc/help/preferences.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/preferences.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="common.html#common" title="common">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/rollback.html
===================================================================
--- trunk/tora/doc/help/rollback.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/rollback.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="trace.html#trace" title="trace">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/script.html
===================================================================
--- trunk/tora/doc/help/script.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/script.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="analyze.html#analyze" title="analyze">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/searchreplace.html
===================================================================
--- trunk/tora/doc/help/searchreplace.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/searchreplace.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="preferences.html#preferences" title="preferences">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/security.html
===================================================================
--- trunk/tora/doc/help/security.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/security.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="storage.html#storage" title="storage">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/session.html
===================================================================
--- trunk/tora/doc/help/session.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/session.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="rollback.html#rollback" title="rollback">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/sgastatement.html
===================================================================
--- trunk/tora/doc/help/sgastatement.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/sgastatement.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="explainplan.html#explainplan" title="explainplan">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/sqledit.html
===================================================================
--- trunk/tora/doc/help/sqledit.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/sqledit.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="prev" href="template.html#template" title="template">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/storage.html
===================================================================
--- trunk/tora/doc/help/storage.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/storage.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="session.html#session" title="session">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/template.html
===================================================================
--- trunk/tora/doc/help/template.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/template.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="sqledit.html#sqledit" title="sqledit">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/tools.html
===================================================================
--- trunk/tora/doc/help/tools.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/tools.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="extendingtora.html#extendingtora" title="extendingtora">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/toolsetting.html
===================================================================
--- trunk/tora/doc/help/toolsetting.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/toolsetting.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="prev" href="additionalhelp.html#additionalhelp" title="additionalhelp">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/tora.texi
===================================================================
--- trunk/tora/doc/help/tora.texi 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/tora.texi 2010-07-18 11:29:05 UTC (rev 3632)
@@ -8,7 +8,7 @@
@c %**end of header
@copying
-This manual is for TOra, version 2.1.2+.
+This manual is for TOra, version 2.1.3+.
@end copying
@titlepage
@@ -23,7 +23,7 @@
@ifnottex
@node Top
-@top TOra Manual 2.1.2+
+@top TOra Manual 2.1.3+
@insertcopying
Modified: trunk/tora/doc/help/trace.html
===================================================================
--- trunk/tora/doc/help/trace.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/trace.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="current.html#current" title="current">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/tuning.html
===================================================================
--- trunk/tora/doc/help/tuning.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/tuning.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="security.html#security" title="security">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/unittest.html
===================================================================
--- trunk/tora/doc/help/unittest.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/unittest.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="tuning.html#tuning" title="tuning">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/whatprivileges.html
===================================================================
--- trunk/tora/doc/help/whatprivileges.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/whatprivileges.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -10,7 +10,7 @@
<link rel="next" href="editors.html#editors" title="editors">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/window.html
===================================================================
--- trunk/tora/doc/help/window.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/window.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="newconnection.html#newconnection" title="newconnection">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/worksheet.html
===================================================================
--- trunk/tora/doc/help/worksheet.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/worksheet.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="browser.html#browser" title="browser">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/workspace.html
===================================================================
--- trunk/tora/doc/help/workspace.html 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/doc/help/workspace.html 2010-07-18 11:29:05 UTC (rev 3632)
@@ -9,7 +9,7 @@
<link rel="next" href="tools.html#tools" title="tools">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.2+.-->
+This manual is for TOra, version 2.1.3+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Added: trunk/tora/src/help/images/exporttofile.png
===================================================================
--- trunk/tora/src/help/images/exporttofile.png (rev 0)
+++ trunk/tora/src/help/images/exporttofile.png 2010-07-18 11:29:05 UTC (rev 3632)
@@ -0,0 +1 @@
+link ../../../doc/help/images/exporttofile.png
\ No newline at end of file
Property changes on: trunk/tora/src/help/images/exporttofile.png
___________________________________________________________________
Added: svn:special
+ *
Modified: trunk/tora/src/tora.qrc
===================================================================
--- trunk/tora/src/tora.qrc 2010-07-18 10:19:50 UTC (rev 3631)
+++ trunk/tora/src/tora.qrc 2010-07-18 11:29:05 UTC (rev 3632)
@@ -40,6 +40,7 @@
<file>help/images/describe.png</file>
<file>help/images/difference.png</file>
<file>help/images/editmenu.png</file>
+ <file>help/images/exporttofile.png</file>
<file>help/images/filemenu.png</file>
<file>help/images/editor.png</file>
<file>help/images/editor_syntax.png</file>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2010-09-01 15:29:25
|
Revision: 3682
http://tora.svn.sourceforge.net/tora/?rev=3682&view=rev
Author: ibre5041
Date: 2010-09-01 15:29:19 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
windows compile fix (instantclient)
Modified Paths:
--------------
trunk/tora/cmake/modules/FindOracle.cmake
trunk/tora/src/otl/otlv4.h
Modified: trunk/tora/cmake/modules/FindOracle.cmake
===================================================================
--- trunk/tora/cmake/modules/FindOracle.cmake 2010-09-01 15:02:24 UTC (rev 3681)
+++ trunk/tora/cmake/modules/FindOracle.cmake 2010-09-01 15:29:19 UTC (rev 3682)
@@ -50,6 +50,8 @@
${ORACLE_HOME}/sdk/include
# xe on windows
${ORACLE_HOME}/OCI/include
+ # InstantClient on WinXP
+ ${ORACLE_HOME}/sdk/lib/msvc/
)
ENDIF (ORACLE_PATH_INCLUDES)
Modified: trunk/tora/src/otl/otlv4.h
===================================================================
--- trunk/tora/src/otl/otlv4.h 2010-09-01 15:02:24 UTC (rev 3681)
+++ trunk/tora/src/otl/otlv4.h 2010-09-01 15:29:19 UTC (rev 3682)
@@ -20353,6 +20353,15 @@
else
return 1;
}
+
+ int reset(void)
+ {int status;
+ status=OCIReset(srvhp,errhp);
+ if(status)
+ return 0;
+ else
+ return 1;
+ }
int server_attach(const char* tnsname)
{int& status=last_status;
@@ -23696,6 +23705,19 @@
}
}
+ void reset(void)
+ OTL_THROWS_OTL_EXCEPTION
+ {
+ if(!connected)return;
+ retcode=connect_struct.reset();
+ if(!retcode){
+ throw_count++;
+ if(throw_count>1)return;
+ if(otl_uncaught_exception()) return;
+ throw otl_exception(connect_struct);
+ }
+ }
+
#if defined(OTL_ORA10G_R2)
void commit_nowait(void)
OTL_THROWS_OTL_EXCEPTION
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2010-09-19 16:43:46
|
Revision: 3687
http://tora.svn.sourceforge.net/tora/?rev=3687&view=rev
Author: tomasstraupis
Date: 2010-09-19 16:43:40 +0000 (Sun, 19 Sep 2010)
Log Message:
-----------
Update info before release.
Modified Paths:
--------------
trunk/tora/ChangeLog
trunk/tora/NEWS
Removed Paths:
-------------
trunk/tora/debian/changelog
Modified: trunk/tora/ChangeLog
===================================================================
--- trunk/tora/ChangeLog 2010-09-16 22:57:58 UTC (rev 3686)
+++ trunk/tora/ChangeLog 2010-09-19 16:43:40 UTC (rev 3687)
@@ -1,27 +1,76 @@
+tora (2.1.3-1) unstable; urgency=lowercase
+
+Features:
+ * Terradata support
+ * AWR performance report tool
+ * xml formatting for memo editor/display
+ * Improved support for displaying routines in MySQL. From now on it will
+ display full routine creation script including arguments, return type etc.
+ * close buttons in tabs implemented
+ * connection dialog: test connection button
+ * F4 describe under cursor in PL/SQL editor
+ * RFE #2949032 tab with directories into the schema browser
+ * RFE #2916092 - column "percentage free" in the storage manage
+
+Bugfixes:
+
+ * Build fixes (macosx, windows, cmake, rpm, oci stub)
+ * Do not update current schema on focus if schema had already been changed
+ * Enable syntax colouring only if "Syntax highlighting" was selected in preferences
+ * Fix for pl/sql editor in the case of TYPE BODY
+ * Add SCI_LEXER, fixes highlight issue on ubuntu
+ * Full implementation of bug #2477760 - data shown in storage manager is
+ not sortable
+ * Check/drop MySQL routine before creating one.
+ * A problem when in MySQL "show create ..." returns different number of
+ columns for users with different permissions
+ * Rollback segments tool shows a lot of duplicate columns. "Initial", "next"
+ columns have a lot of "(((((((" characters. Tree view is replaced with
+ toresulttable. Less code, mem-leaks fixes
+ * Fix crash when entering a dot after a forward slash in editor
+ * Fixed #514310: When switching to a different schema, or refreshing the
+ current schema in schema browser, the detail window still displays the info
+ for the last item selected
+ * Updated sql that includes user role access
+ * Patch #3022103: TOra fails to build with Qt 4.7. by Felix Geyer
+ * Fix directory browser for trotl
+ * Apply patch for column labels from John Vandenberg
+ * Fixed #3023700 When i right click on a dblink in the database browser, they
+ are entry, drop index, create index, modify index instead of dblink entry
+
+Development:
+
+ * Various Trotl improvements and fixes
+ * toResultCombo can use a query returning more than one colum
+ - toResultCombo can use a query returning more than one colum, 1st column
+ is desplayed, the others are kept as a vector of QVariants. This is used in
+ AWR tool to keep mapping between diplayed snap time and the snap id. (I
+ know that in QT4 I should use MVC, in the future, mayby)
+ - toResulCombe can have selectPolicy. It can be set to either:
+ None - default behaviour, does nothing
+ First - select the first Combo field
+ LastButOne -
+ Last -
+ * Example tool window
+
tora (2.1.2-1) unstable; urgency=low
- * Added debug package. (Closes: #560064)
- * New Upstream version 2.1.2
- * Improved: Add editor option for uppler/lowercase object names
- * Improved: Db extract/compare tool now remembers widgets states
- * New: Filesystem completer for target line edit
- * Improved: Compatibility with sql+
- * New: Color/pixmap identifier for connection
- * Improved: Schema browser improvements
- * New: Ability to add external static check
- * New: Save package specification and body to one file
- * New: Initial support for creating/modifying tables
- * Bugfixes
- * Bumped Standards-Version to 3.8.4, no changes needed.
- * No patches needed anymore, removed patch system.
+ * Improved: Add editor option for uppler/lowercase object names
+ * Improved: Db extract/compare tool now remembers widgets states
+ * New: Filesystem completer for target line edit
+ * Improved: Compatibility with sql+
+ * New: Color/pixmap identifier for connection
+ * Improved: Schema browser improvements
+ * New: Ability to add external static check
+ * New: Save package specification and body to one file
+ * New: Initial support for creating/modifying tables
+ * Bugfixes
- -- Michael Meskes <me...@de...> Tue, 30 Mar 2010 13:14:16 +0200
-
tora (2.1.1-1) unstable; urgency=low
- * New upstream version.
+ * New upstream version
- -- Michael Meskes <me...@de...> Thu, 19 Nov 2009 15:18:19 +0100
+ -- Nathan Neulinger <nn...@ne...> Tue, 13 Oct 2009 13:44:40 -0600
tora (2.1.0-1) unstable; urgency=low
Modified: trunk/tora/NEWS
===================================================================
--- trunk/tora/NEWS 2010-09-16 22:57:58 UTC (rev 3686)
+++ trunk/tora/NEWS 2010-09-19 16:43:40 UTC (rev 3687)
@@ -1,3 +1,6 @@
+2.1.3:
+2010-09-20: Bugfix release. See ChangeLog for full details
+
2.1.2:
2009-10-14: Added win32 cross compile scripts/patches/notes from ZippyDufus <zip...@ya...>
Deleted: trunk/tora/debian/changelog
===================================================================
--- trunk/tora/debian/changelog 2010-09-16 22:57:58 UTC (rev 3686)
+++ trunk/tora/debian/changelog 2010-09-19 16:43:40 UTC (rev 3687)
@@ -1 +0,0 @@
-link ../ChangeLog
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2010-09-28 19:37:10
|
Revision: 3696
http://tora.svn.sourceforge.net/tora/?rev=3696&view=rev
Author: tomasstraupis
Date: 2010-09-28 19:37:03 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Multi-line table cells
Modified Paths:
--------------
trunk/tora/doc/help/globalsettings.html
trunk/tora/doc/help/images/preferences.png
trunk/tora/doc/help/preferences.texi
trunk/tora/src/toconf.h
trunk/tora/src/toconfiguration.cpp
trunk/tora/src/toconfiguration.h
trunk/tora/src/toglobalsetting.cpp
trunk/tora/src/toglobalsettingui.ui
trunk/tora/src/toresulttableview.cpp
trunk/tora/src/toresulttableview.h
Modified: trunk/tora/doc/help/globalsettings.html
===================================================================
--- trunk/tora/doc/help/globalsettings.html 2010-09-27 09:10:39 UTC (rev 3695)
+++ trunk/tora/doc/help/globalsettings.html 2010-09-28 19:37:03 UTC (rev 3696)
@@ -39,24 +39,30 @@
<p><table summary=""><tr align="left"><td valign="top" width="20%"><strong>Custom SQL</strong> </td><td valign="top" width="80%">The file in which to store your custom SQL. For more information about custom SQL and the SQL dictionary (see <a href="sqledit.html#sqledit">SQL Editor tool</a>. The string <samp><span class="env">$HOME</span></samp> will be replaced by your home directory on UNIX or documents directory in Windows.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Help directory</strong> </td><td valign="top" width="80%">Should point to where the TOra help table of contents file is stored (toc.html). This should be set up correctly if you made a normal install.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Plugin directory</strong> </td><td valign="top" width="80%">This option is only available in a plugin based TOra installation. It should point to the directory where the plugins for TOra are located. It should be set up correctly on installation if needed.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Default session</strong> </td><td valign="top" width="80%">TODO.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Cache directory</strong> </td><td valign="top" width="80%">Should point to where the TOra Disk Cache files are stored. There is one file for each Connection.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Change current connection with active window</strong> </td><td valign="top" width="80%">If this option is set, changing the current window will also change the current connection to that of the active window. The connection is only changed when you change window so if you want to change the connection to something else you can still do so as long as you don't change the window.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Save last password</strong> </td><td valign="top" width="80%">Whether or not TOra should store the last password used to connect. <strong>Be aware that the password is store in clear text in either the windows registry or a file.</strong>
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Save passwords</strong> </td><td valign="top" width="80%">Whether or not TOra should store the passwords used to connect. <strong>Be aware that the passwords are stored in clear text in either the windows registry or a file.</strong>
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Include DB in caption</strong> </td><td valign="top" width="80%">If this is set the database name will be included in the caption of all your tool windows after the tool name. Observe that there often is no other way of knowing which database the window works on except for this.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Maximize window on start</strong> </td><td valign="top" width="80%">If this is checked the TOra main window will open maximized on startup.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Desktop Aware</strong> </td><td valign="top" width="80%">Set this if Qt should try to figure out and interact nicely with the desktop environment. The reason for this switch is that in some versions of KDE TOra doesn't look nice if this is checked. This switch is only available for Qt only applications.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>use Disk Cache</strong> </td><td valign="top" width="80%">This option tells TOra to Cache the Object List in the Cache Directory. Default is No Caching. When Caching is activated, you have to refresh the object cache with the menu option File->Reread Object Cache, because, the default source for the Object List is the diskfile.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Antialias fonts</strong> </td><td valign="top" width="80%">Check this if you want TOra to use antialiased fonts in X11 if available. This option may not be available (Regardless of if you have access to antialiased fonts or not).
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Docks use toolbars</strong> </td><td valign="top" width="80%">This option tells TOra how to emulate docked windows when they are not available. Docked windows are not available if you do not use KDE and have a Qt version less than 3 (If you run in windows you're it). If this is checked docks will be emulated with a toolbar, this has the drawback that you can't resize them. If unchecked docks appear in normal windows.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Style</strong> </td><td valign="top" width="80%">The GUI style to use for the TOra application. This switch is only available for Qt only applications.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Restore session on startup</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Prefer TOAD key bindings</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Use Disk Caching</strong> </td><td valign="top" width="80%">This option tells TOra to Cache the Object List in the Cache Directory. Default is No Caching. When Caching is activated, you have to refresh the object cache with the menu option File->Reread Object Cache, because, the default source for the Object List is the diskfile.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display gridlines in results</strong> </td><td valign="top" width="80%">TODO.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display alerts in statusbar only</strong> </td><td valign="top" width="80%">Display errors only in the statusbar. This is really useful since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Arrange Tools in Tabs</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>User Colours in Connections</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Multi-line results</strong> </td><td valign="top" width="80%">All tables in all tools (Schema browser, SQL editor, Session list etc.) will have multi-line cells if text contains more than one line or if it does not fit into one cell horizontally.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Connect history</strong> </td><td valign="top" width="80%">How many connection entries to save in the new connection history list.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Table scale</strong> </td><td valign="top" width="80%">This is the scale which to use when printing lists. Lists on paper can usually be a little smaller and still be readable. Given as a fraction where 0.5 means half the size on paper and 1.0 the same size.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Status message</strong> </td><td valign="top" width="80%">The number of seconds to display error messages in the status bar. If you specify 0 they are kept until the next message is displayed.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Message history</strong> </td><td valign="top" width="80%">The number of status messages to store in the status message history before the oldest are removed when new are added.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Chart samples</strong> </td><td valign="top" width="80%">Number of samples to save by default in charts.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display samples</strong> </td><td valign="top" width="80%">TODO.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Size Unit</strong> </td><td valign="top" width="80%">The unit to display sizes with in TOra.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Refresh</strong> </td><td valign="top" width="80%">The default refresh time to use in TOra. Tools which refresh automatically use this setting as the default. It can also be changed on a per tool basis.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Refresh</strong> </td><td valign="top" width="80%">The default refresh time to use in TOra. Tools which refresh automatically use this setting as the default. It can also be changed on a per tool basis.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Default format</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Style</strong> </td><td valign="top" width="80%">The GUI style to use for the TOra application. This switch is only available for Qt only applications.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Translation</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>SMTP Server</strong> </td><td valign="top" width="80%">TODO.
<br></td></tr></table>
</body></html>
Modified: trunk/tora/doc/help/images/preferences.png
===================================================================
--- trunk/tora/doc/help/images/preferences.png 2010-09-27 09:10:39 UTC (rev 3695)
+++ trunk/tora/doc/help/images/preferences.png 2010-09-28 19:37:03 UTC (rev 3696)
@@ -1,665 +1,764 @@
\x89PNG
|
|
From: <tom...@us...> - 2010-09-28 20:21:48
|
Revision: 3698
http://tora.svn.sourceforge.net/tora/?rev=3698&view=rev
Author: tomasstraupis
Date: 2010-09-28 20:21:29 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Update TOra version number
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/configure.ac
trunk/tora/doc/help/Index_002dlist.html
trunk/tora/doc/help/additionalhelp.html
trunk/tora/doc/help/alert.html
trunk/tora/doc/help/analyze.html
trunk/tora/doc/help/api.html
trunk/tora/doc/help/browser.html
trunk/tora/doc/help/charts.html
trunk/tora/doc/help/common.html
trunk/tora/doc/help/current.html
trunk/tora/doc/help/database.html
trunk/tora/doc/help/debugger.html
trunk/tora/doc/help/editor.html
trunk/tora/doc/help/editors.html
trunk/tora/doc/help/explainplan.html
trunk/tora/doc/help/extendingtora.html
trunk/tora/doc/help/externalapi.html
trunk/tora/doc/help/gettingbindparameters.html
trunk/tora/doc/help/globalsettings.html
trunk/tora/doc/help/help.html
trunk/tora/doc/help/history.html
trunk/tora/doc/help/index.html
trunk/tora/doc/help/invalid.html
trunk/tora/doc/help/lists.html
trunk/tora/doc/help/memoeditor.html
trunk/tora/doc/help/newconnection.html
trunk/tora/doc/help/objectdescription.html
trunk/tora/doc/help/output.html
trunk/tora/doc/help/plsqleditor.html
trunk/tora/doc/help/preferences.html
trunk/tora/doc/help/rollback.html
trunk/tora/doc/help/script.html
trunk/tora/doc/help/searchreplace.html
trunk/tora/doc/help/security.html
trunk/tora/doc/help/session.html
trunk/tora/doc/help/sgastatement.html
trunk/tora/doc/help/sqledit.html
trunk/tora/doc/help/storage.html
trunk/tora/doc/help/template.html
trunk/tora/doc/help/tools.html
trunk/tora/doc/help/toolsetting.html
trunk/tora/doc/help/tora.texi
trunk/tora/doc/help/trace.html
trunk/tora/doc/help/tuning.html
trunk/tora/doc/help/unittest.html
trunk/tora/doc/help/whatprivileges.html
trunk/tora/doc/help/window.html
trunk/tora/doc/help/worksheet.html
trunk/tora/doc/help/workspace.html
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/CMakeLists.txt 2010-09-28 20:21:29 UTC (rev 3698)
@@ -61,7 +61,7 @@
#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level)
SET (VERSION_MAJOR "2")
SET (VERSION_MINOR "1")
-SET (VERSION_PATCH "3")
+SET (VERSION_PATCH "4")
SET (VERSION_SUFFIX "")
SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
Modified: trunk/tora/configure.ac
===================================================================
--- trunk/tora/configure.ac 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/configure.ac 2010-09-28 20:21:29 UTC (rev 3698)
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT([tora],[2.1.3],[tor...@li...])
+AC_INIT([tora],[2.1.4],[tor...@li...])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
# Every other copy of the package version number gets its value from here
Modified: trunk/tora/doc/help/Index_002dlist.html
===================================================================
--- trunk/tora/doc/help/Index_002dlist.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/Index_002dlist.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -8,7 +8,7 @@
<link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/additionalhelp.html
===================================================================
--- trunk/tora/doc/help/additionalhelp.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/additionalhelp.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="toolsetting.html#toolsetting" title="toolsetting">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/alert.html
===================================================================
--- trunk/tora/doc/help/alert.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/alert.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="invalid.html#invalid" title="invalid">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/analyze.html
===================================================================
--- trunk/tora/doc/help/analyze.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/analyze.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="alert.html#alert" title="alert">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/api.html
===================================================================
--- trunk/tora/doc/help/api.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/api.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="externalapi.html#externalapi" title="externalapi">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/browser.html
===================================================================
--- trunk/tora/doc/help/browser.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/browser.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="plsqleditor.html#plsqleditor" title="plsqleditor">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/charts.html
===================================================================
--- trunk/tora/doc/help/charts.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/charts.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="searchreplace.html#searchreplace" title="searchreplace">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/common.html
===================================================================
--- trunk/tora/doc/help/common.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/common.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="prev" href="preferences.html#preferences" title="preferences">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/current.html
===================================================================
--- trunk/tora/doc/help/current.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/current.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="script.html#script" title="script">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/database.html
===================================================================
--- trunk/tora/doc/help/database.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/database.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="additionalhelp.html#additionalhelp" title="additionalhelp">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/debugger.html
===================================================================
--- trunk/tora/doc/help/debugger.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/debugger.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="unittest.html#unittest" title="unittest">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/editor.html
===================================================================
--- trunk/tora/doc/help/editor.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/editor.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="database.html#database" title="database">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/editors.html
===================================================================
--- trunk/tora/doc/help/editors.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/editors.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="lists.html#lists" title="lists">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/explainplan.html
===================================================================
--- trunk/tora/doc/help/explainplan.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/explainplan.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="gettingbindparameters.html#gettingbindparameters" title="gettingbindparameters">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/extendingtora.html
===================================================================
--- trunk/tora/doc/help/extendingtora.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/extendingtora.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="Index_002dlist.html#Index_002dlist" title="Index-list">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/externalapi.html
===================================================================
--- trunk/tora/doc/help/externalapi.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/externalapi.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="prev" href="api.html#api" title="api">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/gettingbindparameters.html
===================================================================
--- trunk/tora/doc/help/gettingbindparameters.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/gettingbindparameters.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="objectdescription.html#objectdescription" title="objectdescription">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/globalsettings.html
===================================================================
--- trunk/tora/doc/help/globalsettings.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/globalsettings.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="editor.html#editor" title="editor">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/help.html
===================================================================
--- trunk/tora/doc/help/help.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/help.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="history.html#history" title="history">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/history.html
===================================================================
--- trunk/tora/doc/help/history.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/history.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="workspace.html#workspace" title="workspace">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/index.html
===================================================================
--- trunk/tora/doc/help/index.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/index.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -7,7 +7,7 @@
<link title="Top" rel="start" href="#Top">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
@@ -26,7 +26,7 @@
<div class="contents">
<h2>Table of Contents</h2>
<ul>
-<li><a name="toc_Top" href="index.html#Top">TOra Manual 2.1.3+</a>
+<li><a name="toc_Top" href="index.html#Top">TOra Manual 2.1.4+</a>
<li><a name="toc_help" href="help.html#help">1 Using the help browser</a>
<li><a name="toc_history" href="history.html#history">2 History of TOra</a>
<li><a name="toc_workspace" href="workspace.html#workspace">3 Getting to know your workspace</a>
@@ -96,9 +96,9 @@
<hr>
</div>
-<h2 class="unnumbered">TOra Manual 2.1.3+</h2>
+<h2 class="unnumbered">TOra Manual 2.1.4+</h2>
-<p>This manual is for TOra, version 2.1.3+.
+<p>This manual is for TOra, version 2.1.4+.
<ul class="menu">
<li><a accesskey="1" href="help.html#help">Using the help browser</a>
Modified: trunk/tora/doc/help/invalid.html
===================================================================
--- trunk/tora/doc/help/invalid.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/invalid.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="output.html#output" title="output">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/lists.html
===================================================================
--- trunk/tora/doc/help/lists.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/lists.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="charts.html#charts" title="charts">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/memoeditor.html
===================================================================
--- trunk/tora/doc/help/memoeditor.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/memoeditor.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="prev" href="objectdescription.html#objectdescription" title="objectdescription">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/newconnection.html
===================================================================
--- trunk/tora/doc/help/newconnection.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/newconnection.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="whatprivileges.html#whatprivileges" title="whatprivileges">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/objectdescription.html
===================================================================
--- trunk/tora/doc/help/objectdescription.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/objectdescription.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="memoeditor.html#memoeditor" title="memoeditor">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/output.html
===================================================================
--- trunk/tora/doc/help/output.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/output.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="template.html#template" title="template">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/plsqleditor.html
===================================================================
--- trunk/tora/doc/help/plsqleditor.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/plsqleditor.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="debugger.html#debugger" title="debugger">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/preferences.html
===================================================================
--- trunk/tora/doc/help/preferences.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/preferences.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="common.html#common" title="common">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/rollback.html
===================================================================
--- trunk/tora/doc/help/rollback.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/rollback.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="trace.html#trace" title="trace">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/script.html
===================================================================
--- trunk/tora/doc/help/script.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/script.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="analyze.html#analyze" title="analyze">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/searchreplace.html
===================================================================
--- trunk/tora/doc/help/searchreplace.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/searchreplace.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="preferences.html#preferences" title="preferences">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/security.html
===================================================================
--- trunk/tora/doc/help/security.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/security.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="storage.html#storage" title="storage">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/session.html
===================================================================
--- trunk/tora/doc/help/session.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/session.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="rollback.html#rollback" title="rollback">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/sgastatement.html
===================================================================
--- trunk/tora/doc/help/sgastatement.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/sgastatement.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="explainplan.html#explainplan" title="explainplan">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/sqledit.html
===================================================================
--- trunk/tora/doc/help/sqledit.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/sqledit.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="prev" href="template.html#template" title="template">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/storage.html
===================================================================
--- trunk/tora/doc/help/storage.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/storage.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="session.html#session" title="session">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/template.html
===================================================================
--- trunk/tora/doc/help/template.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/template.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="sqledit.html#sqledit" title="sqledit">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/tools.html
===================================================================
--- trunk/tora/doc/help/tools.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/tools.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="extendingtora.html#extendingtora" title="extendingtora">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/toolsetting.html
===================================================================
--- trunk/tora/doc/help/toolsetting.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/toolsetting.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="prev" href="additionalhelp.html#additionalhelp" title="additionalhelp">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/tora.texi
===================================================================
--- trunk/tora/doc/help/tora.texi 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/tora.texi 2010-09-28 20:21:29 UTC (rev 3698)
@@ -8,7 +8,7 @@
@c %**end of header
@copying
-This manual is for TOra, version 2.1.3+.
+This manual is for TOra, version 2.1.4+.
@end copying
@titlepage
@@ -23,7 +23,7 @@
@ifnottex
@node Top
-@top TOra Manual 2.1.3+
+@top TOra Manual 2.1.4+
@insertcopying
Modified: trunk/tora/doc/help/trace.html
===================================================================
--- trunk/tora/doc/help/trace.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/trace.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="current.html#current" title="current">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/tuning.html
===================================================================
--- trunk/tora/doc/help/tuning.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/tuning.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="security.html#security" title="security">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/unittest.html
===================================================================
--- trunk/tora/doc/help/unittest.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/unittest.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="tuning.html#tuning" title="tuning">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/whatprivileges.html
===================================================================
--- trunk/tora/doc/help/whatprivileges.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/whatprivileges.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -10,7 +10,7 @@
<link rel="next" href="editors.html#editors" title="editors">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/window.html
===================================================================
--- trunk/tora/doc/help/window.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/window.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="newconnection.html#newconnection" title="newconnection">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/worksheet.html
===================================================================
--- trunk/tora/doc/help/worksheet.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/worksheet.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="browser.html#browser" title="browser">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
Modified: trunk/tora/doc/help/workspace.html
===================================================================
--- trunk/tora/doc/help/workspace.html 2010-09-28 19:45:30 UTC (rev 3697)
+++ trunk/tora/doc/help/workspace.html 2010-09-28 20:21:29 UTC (rev 3698)
@@ -9,7 +9,7 @@
<link rel="next" href="tools.html#tools" title="tools">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
-This manual is for TOra, version 2.1.3+.-->
+This manual is for TOra, version 2.1.4+.-->
<meta http-equiv="Content-Style-Type" content="text/css">
<style type="text/css"><!--
pre.display { font-family:inherit }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nn...@us...> - 2010-10-16 15:38:01
|
Revision: 3782
http://tora.svn.sourceforge.net/tora/?rev=3782&view=rev
Author: nneul
Date: 2010-10-16 15:37:54 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
set mime types on image files and apply patch from andreas for doc updates
Modified Paths:
--------------
trunk/tora/doc/help/database.texi
trunk/tora/doc/help/images/newconnection.png
trunk/tora/doc/help/images/oracle.png
trunk/tora/doc/help/newconnection.texi
trunk/tora/doc/help/preferences.texi
trunk/tora/src/tomodeleditor.cpp
Property Changed:
----------------
trunk/tora/doc/help/images/additionalhelp.png
trunk/tora/doc/help/images/addwatch.png
trunk/tora/doc/help/images/alert.png
trunk/tora/doc/help/images/analyze.png
trunk/tora/doc/help/images/browser.png
trunk/tora/doc/help/images/browserfilter.png
trunk/tora/doc/help/images/changewatch.png
trunk/tora/doc/help/images/charts.png
trunk/tora/doc/help/images/chartsetup.png
trunk/tora/doc/help/images/contentfilter.png
trunk/tora/doc/help/images/current.png
trunk/tora/doc/help/images/database.png
trunk/tora/doc/help/images/debugger.png
trunk/tora/doc/help/images/describe.png
trunk/tora/doc/help/images/difference.png
trunk/tora/doc/help/images/editmenu.png
trunk/tora/doc/help/images/editor.png
trunk/tora/doc/help/images/editor_syntax.png
trunk/tora/doc/help/images/exporttofile.png
trunk/tora/doc/help/images/filemenu.png
trunk/tora/doc/help/images/fonts.png
trunk/tora/doc/help/images/getparam.png
trunk/tora/doc/help/images/help.png
trunk/tora/doc/help/images/helpmenu.png
trunk/tora/doc/help/images/invalid.png
trunk/tora/doc/help/images/largelogo.png
trunk/tora/doc/help/images/lists.png
trunk/tora/doc/help/images/memo.png
trunk/tora/doc/help/images/mysql.png
trunk/tora/doc/help/images/newconnection.png
trunk/tora/doc/help/images/oracle.png
trunk/tora/doc/help/images/output.png
trunk/tora/doc/help/images/pfileeditor.png
trunk/tora/doc/help/images/preferences.png
trunk/tora/doc/help/images/priviledges.png
trunk/tora/doc/help/images/quota.png
trunk/tora/doc/help/images/resize.png
trunk/tora/doc/help/images/rollback.png
trunk/tora/doc/help/images/rollbacksetup.png
trunk/tora/doc/help/images/script.png
trunk/tora/doc/help/images/searchreplace.png
trunk/tora/doc/help/images/security.png
trunk/tora/doc/help/images/session.png
trunk/tora/doc/help/images/sgastatement.png
trunk/tora/doc/help/images/sgatrace.png
trunk/tora/doc/help/images/sqledit.png
trunk/tora/doc/help/images/storage.png
trunk/tora/doc/help/images/template.png
trunk/tora/doc/help/images/templateeditor.png
trunk/tora/doc/help/images/templatesetup.png
trunk/tora/doc/help/images/toolbar.png
trunk/tora/doc/help/images/tools.png
trunk/tora/doc/help/images/toolsmenu.png
trunk/tora/doc/help/images/tuning.png
trunk/tora/doc/help/images/visualize.png
trunk/tora/doc/help/images/windowsmenu.png
trunk/tora/doc/help/images/worksheet.png
trunk/tora/doc/help/images/worksheetsetup.png
trunk/tora/doc/help/images/workspace.png
Modified: trunk/tora/doc/help/database.texi
===================================================================
--- trunk/tora/doc/help/database.texi 2010-10-15 18:43:28 UTC (rev 3781)
+++ trunk/tora/doc/help/database.texi 2010-10-16 15:37:54 UTC (rev 3782)
@@ -42,9 +42,10 @@
@item @strong{Connection test interval}
Interval in seconds at which TOra should be sending dummy queries to database (see "Firewall mode").
@item @strong{Indicate empty values as ''.}
- TODO.
+ Display NULL values as "@{null@}" in the specified color.
@item @strong{Number format.}
- TODO.
+ Select the format for displaying numbers. You can choose from "Default", "Scientific" and "Fixed decimal"
+ where the last allows you to specify the number of decimals.
@end table
There may also be pages under this for each individual database provider. Currently only Oracle and MySql uses this
@@ -62,17 +63,24 @@
it starts to operate. The string should be a standard Oracle date to string conversion specification. For more
information see the Oracle SQL Reference.
@item @strong{Maximum cursors to keep open}
- TODO.
+ This specifies the size of the connection pool if TOra was compiled with OTL_STREAM_POOLING_ON.
@item @strong{Max LONG and LOB data length}
The amount of data to read from LONG, BLOB or CLOB data fields. If you always want all the data to be read
check the @strong{Unlimited} checkbox to the right. LONG datafields can not be specified as @strong{Unlimited},
if this is specified 33000 characters are read by default.
@item @strong{Explain plan table}
- The table to use to temporarily store explained execution plans. Use the @strong{Create Table} button to create
- the table if you don't have it.
+ The table to use to temporarily store explained execution plans. the table can be specified with or without a
+ schema name. If you leave out a schemaname the table will be created in the schema of the connected user, either
+ manually by clicking @strong{Create Table} button or automatically by TOra if needed and confirmed by the user.
@item @strong{Keep plans}
- If this is check explained plans are left in the explain plan table. The normal behaviour is to rollback the
+ If this is checked explained plans are left in the explain plan table. The normal behaviour is to rollback the
explanation after it is initially read to keep the explain plan table from filling up with old plans.
+@item @strong{Use V$SQL_PLAN}
+ If possible, TOra will try to get the execution plan by reading V$SQL_PLAN instead of executing EXPLAIN for the
+ statement.
+@item @strong{shared PLAN_TABLE}
+ Enable this option if you wish to use the system-wide PLAN_TABLE provided by Oracle or a shared
+ plan table set up by yourself. In this case TOra will never create a plan table for you.
@end table
@image{images/mysql,13cm}
Property changes on: trunk/tora/doc/help/images/additionalhelp.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/addwatch.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/alert.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/analyze.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/browser.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/browserfilter.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/changewatch.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/charts.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/chartsetup.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/contentfilter.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/current.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/database.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/debugger.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/describe.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/difference.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/editmenu.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/editor.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/tora/doc/help/images/editor_syntax.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/tora/doc/help/images/exporttofile.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Property changes on: trunk/tora/doc/help/images/filemenu.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/fonts.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/getparam.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/help.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/helpmenu.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/invalid.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/largelogo.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/lists.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/memo.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/mysql.png
___________________________________________________________________
Modified: svn:mime-type
- application/octet-stream
+ image/png
Modified: trunk/tora/doc/help/images/newconnection.png
===================================================================
(Binary files differ)
Property changes on: trunk/tora/doc/help/images/newconnection.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/tora/doc/help/images/oracle.png
===================================================================
(Binary files differ)
Property changes on: trunk/tora/doc/help/images/oracle.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/output.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/pfileeditor.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/preferences.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/priviledges.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/quota.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/resize.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/rollback.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/rollbacksetup.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/script.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/searchreplace.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/security.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/session.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/sgastatement.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/sgatrace.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/sqledit.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/storage.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/template.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/templateeditor.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/templatesetup.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/toolbar.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/tools.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/toolsmenu.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/tuning.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/visualize.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/windowsmenu.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/worksheet.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/worksheetsetup.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Property changes on: trunk/tora/doc/help/images/workspace.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/tora/doc/help/newconnection.texi
===================================================================
--- trunk/tora/doc/help/newconnection.texi 2010-10-15 18:43:28 UTC (rev 3781)
+++ trunk/tora/doc/help/newconnection.texi 2010-10-16 15:37:54 UTC (rev 3782)
@@ -8,7 +8,7 @@
@image{images/newconnection,12cm}
-The filling out of this dialog is pretty straight forward.
+The filling out of this dialog is pretty straight forward but the options can vary depending on the selected connection provider.
@table @asis
@@ -17,18 +17,28 @@
@item @strong{Connections}
Values to connect to this database again.
@item @strong{Connection provider}
- The type of connection to create. You can choose from Oracle, MySQL and others.
+ The type of connection to create. TOra currently supports Teradata, PostgrSQL, Oracle and MySQL.
@item @strong{Username}
The username with which to connect to the database
@item @strong{Password}
- The password to use for the connection, this defaults to manager. You can also configure TOra to remember your last used password (@pxref{preferences,Options})
+ The password to use for the connection. You can also configure TOra to remember your last used password (@pxref{preferences,Options})
@item @strong{Use SQL*Net}
This is perhaps the most difficult setting. This indicates whether to connect locally to the database or use SQL*Net. If you check this box the connection is made through the Oracle listener, otherwise a local connection usually using shared memory or named pipes is made. This is only available for Oracle connections.
@item @strong{Hostname}
- The host on which the database resides. This is only available for non Oracle connections.
+ The host on which the database resides.
@item @strong{Database}
- What database to connect to, the listbox is filled with the values available in your tnsnames.ora file.
+ What database to connect to. For Oracle, the listbox is filled with the values available in your tnsnames.ora file.
@item @strong{Connection Mode}
- The type of connection to make, usually @strong{normal} always suffices here. But sometimes during database administration @strong{SYS_DBA} or @strong{SYS_OPER} is needed. If you don't know what these mean you probably shouldn't be using them.
+ The type of connection to make. For Oracle, usually @strong{normal} always suffices here. But sometimes during database administration @strong{SYS_DBA} or @strong{SYS_OPER} is needed. If you don't know what these mean you probably shouldn't be using them.
+@item @strong{Color Session Identifier}
+ You can flag connections with an identfier. The pre-configured identifiers are @strong{None} with no color, @strong{Testing} in blue, @strong{Development} in green and @strong{Production} in red, but you can change the associated colors and even add some more (@pxref{preferences,Options}).
+@item @strong{Test button}
+ This button lets you test the configured connection without actually saving it.
+@item @strong{Save button}
+ Using this button you can save the connection. Useful if you want to change something like passwords or color identifiers when you normally don't want to connect.
+@item @strong{Import Connections}
+ You can import connections from TOra 1.3.x, Oracle SQL Developer 1.5 and SqirrelSQL 2.6.x. The import dialog is pretty straight forward, just select the type you wish to import and press @strong{Run}.
@end table
-Upon establishing a successful connection all the settings of the dialog will be saved and remembered when the next connection is made with the exception of the password.
+
+Upon establishing a successful connection all the settings of the dialog will be saved and remembered when the next connection is made.
+
Modified: trunk/tora/doc/help/preferences.texi
===================================================================
--- trunk/tora/doc/help/preferences.texi 2010-10-15 18:43:28 UTC (rev 3781)
+++ trunk/tora/doc/help/preferences.texi 2010-10-16 15:37:54 UTC (rev 3782)
@@ -33,30 +33,29 @@
@multitable @columnfractions .2 .8
@item @strong{Custom SQL} @tab The file in which to store your custom SQL. For more information about custom SQL and the SQL dictionary (@pxref{sqledit,SQL Editor tool}. The string @strong{@env{$HOME}} will be replaced by your home directory on UNIX or documents directory in Windows.
@item @strong{Help directory} @tab Should point to where the TOra help table of contents file is stored (toc.html). This should be set up correctly if you made a normal install.
-@item @strong{Plugin directory} @tab This option is only available in a plugin based TOra installation. It should point to the directory where the plugins for TOra are located. It should be set up correctly on installation if needed.
@item @strong{Default session} @tab TODO.
@item @strong{Cache directory} @tab Should point to where the TOra Disk Cache files are stored. There is one file for each Connection.
@item @strong{Change current connection with active window} @tab If this option is set, changing the current window will also change the current connection to that of the active window. The connection is only changed when you change window so if you want to change the connection to something else you can still do so as long as you don't change the window.
-@item @strong{Save passwords} @tab Whether or not TOra should store the passwords used to connect. @strong{Be aware that the passwords are stored in clear text in either the windows registry or a file.}
+@item @strong{Save passwords} @tab Whether or not TOra should store the passwords used to connect. @strong{Be aware that the passwords are obfuscated only and stored in either the windows registry or a file.}
@item @strong{Include DB in caption} @tab If this is set the database name will be included in the caption of all your tool windows after the tool name. Observe that there often is no other way of knowing which database the window works on except for this.
@item @strong{Restore session on startup} @tab TODO.
@item @strong{Prefer TOAD key bindings} @tab TODO.
@item @strong{Use Disk Caching} @tab This option tells TOra to Cache the Object List in the Cache Directory. Default is No Caching. When Caching is activated, you have to refresh the object cache with the menu option File->Reread Object Cache, because, the default source for the Object List is the diskfile.
-@item @strong{Display gridlines in results} @tab TODO.
+@item @strong{Display gridlines in results} @tab Show grid lines in output result window.
@item @strong{Display alerts in statusbar only} @tab Display errors only in the statusbar. This is really useful since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work.
-@item @strong{Arrange Tools in Tabs} @tab TODO.
-@item @strong{User Colours in Connections} @tab TODO.
+@item @strong{Arrange Tools in Tabs} @tab Display the different tools as tabs instead of separate windows in the main window.
+@item @strong{Use Colors in Connections} @tab Assign colors to existing connection identifiers or create new ones.
@item @strong{Multi-line results} @tab All tables in all tools (Schema browser, SQL editor, Session list etc.) will have multi-line cells if text contains more than one line or if it does not fit into one cell horizontally.
@item @strong{Connect history} @tab How many connection entries to save in the new connection history list.
@item @strong{Status message} @tab The number of seconds to display error messages in the status bar. If you specify 0 they are kept until the next message is displayed.
@item @strong{Message history} @tab The number of status messages to store in the status message history before the oldest are removed when new are added.
@item @strong{Chart samples} @tab Number of samples to save by default in charts.
-@item @strong{Display samples} @tab TODO.
+@item @strong{Display samples} @tab The number of samples to display in line and bar graph charts.
@item @strong{Size Unit} @tab The unit to display sizes with in TOra.
@item @strong{Refresh} @tab The default refresh time to use in TOra. Tools which refresh automatically use this setting as the default. It can also be changed on a per tool basis.
-@item @strong{Default format} @tab TODO.
+@item @strong{Default list format} @tab The default format when exporting data in SQL Editor or Schema Browser.
@item @strong{Style} @tab The GUI style to use for the TOra application. This switch is only available for Qt only applications.
-@item @strong{Translation} @tab TODO.
+@item @strong{Translation} @tab Which translation local to use for TOra. Requires restart to take effect.
@item @strong{SMTP Server} @tab TODO.
@end multitable
Modified: trunk/tora/src/tomodeleditor.cpp
===================================================================
--- trunk/tora/src/tomodeleditor.cpp 2010-10-15 18:43:28 UTC (rev 3781)
+++ trunk/tora/src/tomodeleditor.cpp 2010-10-16 15:37:54 UTC (rev 3782)
@@ -195,6 +195,7 @@
Editable = Model->flags(Current) & Qt::ItemIsEditable;
Editor->setReadOnly(!Editable);
Editor->setFocus();
+ Editor->setWordWrap(true);
QDialogButtonBox * buttonBox = new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal, this);
vbox->addWidget(buttonBox);
@@ -256,6 +257,7 @@
QAction * WordWrapAct = new QAction(QIcon(QPixmap(const_cast<const char**>(wordwrap_xpm))),
tr("Word Wrap"), Toolbar);
WordWrapAct->setCheckable(true);
+ WordWrapAct->setChecked(true);
connect(WordWrapAct, SIGNAL(toggled(bool)),
Editor, SLOT(setWordWrap(bool)));
Toolbar->addAction(WordWrapAct);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2010-10-19 18:48:16
|
Revision: 3788
http://tora.svn.sourceforge.net/tora/?rev=3788&view=rev
Author: tomasstraupis
Date: 2010-10-19 18:48:09 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
1. Replace usage of deprecated toNoBlockQuery with toEventQuery in toResultLock.
2. Additional info about result lock in documentation.
3. Recompiled html documentation which included some changes from previous commits.
Modified Paths:
--------------
trunk/tora/doc/help/database.html
trunk/tora/doc/help/globalsettings.html
trunk/tora/doc/help/newconnection.html
trunk/tora/doc/help/session.html
trunk/tora/doc/help/session.texi
trunk/tora/src/toresultlock.cpp
trunk/tora/src/toresultlock.h
Modified: trunk/tora/doc/help/database.html
===================================================================
--- trunk/tora/doc/help/database.html 2010-10-17 20:37:19 UTC (rev 3787)
+++ trunk/tora/doc/help/database.html 2010-10-19 18:48:09 UTC (rev 3788)
@@ -69,8 +69,9 @@
<p><strong>Note!</strong> If you change this option, you have to reconnect in order to make it effective.
<br><dt><strong>Connection test interval</strong><dd> Interval in seconds at which TOra should be sending dummy queries to database (see "Firewall mode").
-<br><dt><strong>Indicate empty values as ”.</strong><dd> TODO.
-<br><dt><strong>Number format.</strong><dd> TODO.
+<br><dt><strong>Indicate empty values as ”.</strong><dd> Display NULL values as "{null}" in the specified color.
+<br><dt><strong>Number format.</strong><dd> Select the format for displaying numbers. You can choose from "Default", "Scientific" and "Fixed decimal"
+ where the last allows you to specify the number of decimals.
</dl>
<p>There may also be pages under this for each individual database provider. Currently only Oracle and MySql uses this
@@ -85,14 +86,19 @@
<br><dt><strong>Default date format</strong><dd> The format that you prefer dates to be displayed. Changing this will require a reconnect to the database before
it starts to operate. The string should be a standard Oracle date to string conversion specification. For more
information see the Oracle SQL Reference.
-<br><dt><strong>Maximum cursors to keep open</strong><dd> TODO.
+<br><dt><strong>Maximum cursors to keep open</strong><dd> This specifies the size of the connection pool if TOra was compiled with OTL_STREAM_POOLING_ON.
<br><dt><strong>Max LONG and LOB data length</strong><dd> The amount of data to read from LONG, BLOB or CLOB data fields. If you always want all the data to be read
check the <strong>Unlimited</strong> checkbox to the right. LONG datafields can not be specified as <strong>Unlimited</strong>,
if this is specified 33000 characters are read by default.
-<br><dt><strong>Explain plan table</strong><dd> The table to use to temporarily store explained execution plans. Use the <strong>Create Table</strong> button to create
- the table if you don't have it.
-<br><dt><strong>Keep plans</strong><dd> If this is check explained plans are left in the explain plan table. The normal behaviour is to rollback the
+<br><dt><strong>Explain plan table</strong><dd> The table to use to temporarily store explained execution plans. the table can be specified with or without a
+ schema name. If you leave out a schemaname the table will be created in the schema of the connected user, either
+ manually by clicking <strong>Create Table</strong> button or automatically by TOra if needed and confirmed by the user.
+<br><dt><strong>Keep plans</strong><dd> If this is checked explained plans are left in the explain plan table. The normal behaviour is to rollback the
explanation after it is initially read to keep the explain plan table from filling up with old plans.
+<br><dt><strong>Use V$SQL_PLAN</strong><dd> If possible, TOra will try to get the execution plan by reading V$SQL_PLAN instead of executing EXPLAIN for the
+ statement.
+<br><dt><strong>shared PLAN_TABLE</strong><dd> Enable this option if you wish to use the system-wide PLAN_TABLE provided by Oracle or a shared
+ plan table set up by yourself. In this case TOra will never create a plan table for you.
</dl>
<div class="block-image"><img src="images/mysql.png" alt="images/mysql.png"></div>
Modified: trunk/tora/doc/help/globalsettings.html
===================================================================
--- trunk/tora/doc/help/globalsettings.html 2010-10-17 20:37:19 UTC (rev 3787)
+++ trunk/tora/doc/help/globalsettings.html 2010-10-19 18:48:09 UTC (rev 3788)
@@ -38,30 +38,29 @@
<p><table summary=""><tr align="left"><td valign="top" width="20%"><strong>Custom SQL</strong> </td><td valign="top" width="80%">The file in which to store your custom SQL. For more information about custom SQL and the SQL dictionary (see <a href="sqledit.html#sqledit">SQL Editor tool</a>. The string <samp><span class="env">$HOME</span></samp> will be replaced by your home directory on UNIX or documents directory in Windows.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Help directory</strong> </td><td valign="top" width="80%">Should point to where the TOra help table of contents file is stored (toc.html). This should be set up correctly if you made a normal install.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Plugin directory</strong> </td><td valign="top" width="80%">This option is only available in a plugin based TOra installation. It should point to the directory where the plugins for TOra are located. It should be set up correctly on installation if needed.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Default session</strong> </td><td valign="top" width="80%">TODO.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Cache directory</strong> </td><td valign="top" width="80%">Should point to where the TOra Disk Cache files are stored. There is one file for each Connection.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Change current connection with active window</strong> </td><td valign="top" width="80%">If this option is set, changing the current window will also change the current connection to that of the active window. The connection is only changed when you change window so if you want to change the connection to something else you can still do so as long as you don't change the window.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Save passwords</strong> </td><td valign="top" width="80%">Whether or not TOra should store the passwords used to connect. <strong>Be aware that the passwords are stored in clear text in either the windows registry or a file.</strong>
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Save passwords</strong> </td><td valign="top" width="80%">Whether or not TOra should store the passwords used to connect. <strong>Be aware that the passwords are obfuscated only and stored in either the windows registry or a file.</strong>
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Include DB in caption</strong> </td><td valign="top" width="80%">If this is set the database name will be included in the caption of all your tool windows after the tool name. Observe that there often is no other way of knowing which database the window works on except for this.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Restore session on startup</strong> </td><td valign="top" width="80%">TODO.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Prefer TOAD key bindings</strong> </td><td valign="top" width="80%">TODO.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Use Disk Caching</strong> </td><td valign="top" width="80%">This option tells TOra to Cache the Object List in the Cache Directory. Default is No Caching. When Caching is activated, you have to refresh the object cache with the menu option File->Reread Object Cache, because, the default source for the Object List is the diskfile.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display gridlines in results</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display gridlines in results</strong> </td><td valign="top" width="80%">Show grid lines in output result window.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display alerts in statusbar only</strong> </td><td valign="top" width="80%">Display errors only in the statusbar. This is really useful since it doesn't interrupt you as much as a dialog window as long as you know to look for information in the statusbar when things doesn't work.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Arrange Tools in Tabs</strong> </td><td valign="top" width="80%">TODO.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>User Colours in Connections</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Arrange Tools in Tabs</strong> </td><td valign="top" width="80%">Display the different tools as tabs instead of separate windows in the main window.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Use Colors in Connections</strong> </td><td valign="top" width="80%">Assign colors to existing connection identifiers or create new ones.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Multi-line results</strong> </td><td valign="top" width="80%">All tables in all tools (Schema browser, SQL editor, Session list etc.) will have multi-line cells if text contains more than one line or if it does not fit into one cell horizontally.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Connect history</strong> </td><td valign="top" width="80%">How many connection entries to save in the new connection history list.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Status message</strong> </td><td valign="top" width="80%">The number of seconds to display error messages in the status bar. If you specify 0 they are kept until the next message is displayed.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Message history</strong> </td><td valign="top" width="80%">The number of status messages to store in the status message history before the oldest are removed when new are added.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Chart samples</strong> </td><td valign="top" width="80%">Number of samples to save by default in charts.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display samples</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Display samples</strong> </td><td valign="top" width="80%">The number of samples to display in line and bar graph charts.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Size Unit</strong> </td><td valign="top" width="80%">The unit to display sizes with in TOra.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Refresh</strong> </td><td valign="top" width="80%">The default refresh time to use in TOra. Tools which refresh automatically use this setting as the default. It can also be changed on a per tool basis.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Default format</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Default list format</strong> </td><td valign="top" width="80%">The default format when exporting data in SQL Editor or Schema Browser.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Style</strong> </td><td valign="top" width="80%">The GUI style to use for the TOra application. This switch is only available for Qt only applications.
-<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Translation</strong> </td><td valign="top" width="80%">TODO.
+<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>Translation</strong> </td><td valign="top" width="80%">Which translation local to use for TOra. Requires restart to take effect.
<br></td></tr><tr align="left"><td valign="top" width="20%"><strong>SMTP Server</strong> </td><td valign="top" width="80%">TODO.
<br></td></tr></table>
Modified: trunk/tora/doc/help/newconnection.html
===================================================================
--- trunk/tora/doc/help/newconnection.html 2010-10-17 20:37:19 UTC (rev 3787)
+++ trunk/tora/doc/help/newconnection.html 2010-10-19 18:48:09 UTC (rev 3788)
@@ -43,20 +43,25 @@
<div class="block-image"><img src="images/newconnection.png" alt="images/newconnection.png"></div>
- <p>The filling out of this dialog is pretty straight forward.
+ <p>The filling out of this dialog is pretty straight forward but the options can vary depending on the selected connection provider.
<dl>
<dt><strong>Previous</strong><dd> This list contains the previous connection made, selecting an entry from this list will set all the values to the right to the correct. Doubleclicking will connect straight away (only makes sense if you save passwords).
<br><dt><strong>Connections</strong><dd> Values to connect to this database again.
-<br><dt><strong>Connection provider</strong><dd> The type of connection to create. You can choose from Oracle, MySQL and others.
+<br><dt><strong>Connection provider</strong><dd> The type of connection to create. TOra currently supports Teradata, PostgrSQL, Oracle and MySQL.
<br><dt><strong>Username</strong><dd> The username with which to connect to the database
-<br><dt><strong>Password</strong><dd> The password to use for the connection, this defaults to manager. You can also configure TOra to remember your last used password (see <a href="preferences.html#preferences">Options</a>)
+<br><dt><strong>Password</strong><dd> The password to use for the connection. You can also configure TOra to remember your last used password (see <a href="preferences.html#preferences">Options</a>)
<br><dt><strong>Use SQL*Net</strong><dd> This is perhaps the most difficult setting. This indicates whether to connect locally to the database or use SQL*Net. If you check this box the connection is made through the Oracle listener, otherwise a local connection usually using shared memory or named pipes is made. This is only available for Oracle connections.
-<br><dt><strong>Hostname</strong><dd> The host on which the database resides. This is only available for non Oracle connections.
-<br><dt><strong>Database</strong><dd> What database to connect to, the listbox is filled with the values available in your tnsnames.ora file.
-<br><dt><strong>Connection Mode</strong><dd> The type of connection to make, usually <strong>normal</strong> always suffices here. But sometimes during database administration <strong>SYS_DBA</strong> or <strong>SYS_OPER</strong> is needed. If you don't know what these mean you probably shouldn't be using them.
+<br><dt><strong>Hostname</strong><dd> The host on which the database resides.
+<br><dt><strong>Database</strong><dd> What database to connect to. For Oracle, the listbox is filled with the values available in your tnsnames.ora file.
+<br><dt><strong>Connection Mode</strong><dd> The type of connection to make. For Oracle, usually <strong>normal</strong> always suffices here. But sometimes during database administration <strong>SYS_DBA</strong> or <strong>SYS_OPER</strong> is needed. If you don't know what these mean you probably shouldn't be using them.
+<br><dt><strong>Color Session Identifier</strong><dd> You can flag connections with an identfier. The pre-configured identifiers are <strong>None</strong> with no color, <strong>Testing</strong> in blue, <strong>Development</strong> in green and <strong>Production</strong> in red, but you can change the associated colors and even add some more (see <a href="preferences.html#preferences">Options</a>).
+<br><dt><strong>Test button</strong><dd> This button lets you test the configured connection without actually saving it.
+<br><dt><strong>Save button</strong><dd> Using this button you can save the connection. Useful if you want to change something like passwords or color identifiers when you normally don't want to connect.
+<br><dt><strong>Import Connections</strong><dd> You can import connections from TOra 1.3.x, Oracle SQL Developer 1.5 and SqirrelSQL 2.6.x. The import dialog is pretty straight forward, just select the type you wish to import and press <strong>Run</strong>.
</dl>
- Upon establishing a successful connection all the settings of the dialog will be saved and remembered when the next connection is made with the exception of the password.
+ <p>Upon establishing a successful connection all the settings of the dialog will be saved and remembered when the next connection is made.
+
</body></html>
Modified: trunk/tora/doc/help/session.html
===================================================================
--- trunk/tora/doc/help/session.html 2010-10-17 20:37:19 UTC (rev 3787)
+++ trunk/tora/doc/help/session.html 2010-10-19 18:48:09 UTC (rev 3788)
@@ -71,7 +71,7 @@
<br><dt><strong>Statistics</strong><dd>The session statistics available for the session. You will get more statistics if you enable timed statistics through the toolbar. There are also two charts displaying waitstates and I/O for the selected session.
<br><dt><strong>Wait events</strong><dd>TODO
<br><dt><strong>Connection info</strong><dd>Information about the connection and versions of the components used.
-<br><dt><strong>Pending locks</strong><dd>What locks this session is currently waiting for.
+<br><dt><strong>Pending locks</strong><dd>What locks this session is currently waiting for. If current session is locked by another session which in turn is locked by the third one, information about the third one is displayed as a child of the second one.
<br><dt><strong>Locked objects</strong><dd>The objects currently locked by this session.
<br><dt><strong>Accessing</strong><dd>TODO
<br><dt><strong>Previous statement</strong><dd>The next to last statement being executed by the session (see <a href="sgastatement.html#sgastatement">sgastatement</a> for information about the statement).
Modified: trunk/tora/doc/help/session.texi
===================================================================
--- trunk/tora/doc/help/session.texi 2010-10-17 20:37:19 UTC (rev 3787)
+++ trunk/tora/doc/help/session.texi 2010-10-19 18:48:09 UTC (rev 3788)
@@ -54,7 +54,7 @@
@item @strong{Connection info}
Information about the connection and versions of the components used.
@item @strong{Pending locks}
-What locks this session is currently waiting for.
+What locks this session is currently waiting for. If current session is locked by another session which in turn is locked by the third one, information about the third one is displayed as a child of the second one.
@item @strong{Locked objects}
The objects currently locked by this session.
@item @strong{Accessing}
Modified: trunk/tora/src/toresultlock.cpp
===================================================================
--- trunk/tora/src/toresultlock.cpp 2010-10-17 20:37:19 UTC (rev 3787)
+++ trunk/tora/src/toresultlock.cpp 2010-10-19 18:48:09 UTC (rev 3788)
@@ -43,7 +43,7 @@
#include "toconf.h"
#include "toconnection.h"
-#include "tonoblockquery.h"
+#include "toeventquery.h"
#include "toresultlock.h"
#include "tosql.h"
#include "totool.h"
@@ -75,12 +75,12 @@
setSQLName(QString::fromLatin1("toResultLock"));
Query = NULL;
- connect(&Poll, SIGNAL(timeout()), this, SLOT(poll()));
}
toResultLock::~toResultLock()
{
- delete Query;
+ if (Query)
+ delete Query;
}
static toSQL SQLBlockingLock("toResultLock:BlockingLocks",
@@ -177,6 +177,14 @@
" and e.request != 0",
"List locks in a session");
+void toResultLock::startQuery(void)
+{
+ connect(Query, SIGNAL(dataAvailable()), this, SLOT(poll()));
+ connect(Query, SIGNAL(done()), this, SLOT(queryDone()));
+ Query->readAll(); // indicate that all records should be fetched
+ Query->start();
+} // startQuery
+
void toResultLock::query(const QString &sql,
const toQList ¶m)
{
@@ -201,130 +209,134 @@
if (!sql.isEmpty())
{
par.insert(par.end(), sql);
- Query = new toNoBlockQuery(connection(), toQuery::Background,
+ Query = new toEventQuery(connection(), toQuery::Background,
toSQL::string(SQLLock, connection()), par);
}
else
{
- Query = new toNoBlockQuery(connection(), toQuery::Background,
+ Query = new toEventQuery(connection(), toQuery::Background,
toSQL::string(SQLBlockingLock, connection()), par);
}
- Poll.start(100);
+ startQuery();
}
TOCATCH
-}
+} // query
-#define MARK_COL 20
-
void toResultLock::poll(void)
{
try
{
if (!toCheckModal(this))
return ;
- if (Query && Query->poll())
+ if (Query)
{
- if (!Query->eof())
+ while (Query->hasMore())
{
- do
- {
- toTreeWidgetItem *item;
- if (!LastItem)
- item = new toResultViewItem(this, NULL);
- else
- item = new toResultViewItem(LastItem, NULL);
- toQDescList desc = Query->describe();
- for (unsigned int pos = 0;pos < desc.size();pos++)
- item->setText(int(pos), Query->readValue());
- }
- while (!Query->eof());
+ toTreeWidgetItem *item;
+ // Check if item has to be added to top level...
+ if (!LastItem)
+ item = new toResultViewItem(this, NULL);
+ // ...or attached as a child record to some parent.
+ else
+ item = new toResultViewItem(LastItem, NULL);
+ toQDescList desc = Query->describe();
+ for (unsigned int pos = 0; pos < desc.size(); pos++)
+ item->setText(int(pos), Query->readValue());
}
+ }
+ }
+ catch (const QString &exc)
+ {
+ delete Query;
+ Query = NULL;
+ toStatusMessage(exc);
+ }
+} // poll
- delete Query;
- Query = NULL;
+// Which column is used as a marker for records processed for children. This
+// column will get value "Yes" so that it is not processed on on subsequent pass.
+#define MARK_COL 20
- LastItem = NULL;
- toTreeWidgetItem *next = NULL;
- for (toTreeWidgetItem *item = firstChild();item;item = next)
+void toResultLock::queryDone(void)
+{
+ if (Query)
+ {
+ delete Query;
+ Query = NULL;
+ }
+
+ LastItem = NULL;
+ toTreeWidgetItem *next = NULL;
+ for (toTreeWidgetItem *item = firstChild(); item; item = next)
+ {
+ int sid = item->text(0).toInt();
+ if (item->text(MARK_COL).isEmpty())
+ {
+ item->setText(MARK_COL, QString::fromLatin1("Yes"));
+ item->setOpen(true);
+ if (!Checked[sid])
{
- int sid = item->text(0).toInt();
- if (item->text(MARK_COL).isEmpty())
+ Checked[sid] = true;
+ LastItem = item;
+ toQList par;
+ par.insert(par.end(), LastItem->text(0));
+ Query = new toEventQuery(connection(), toQuery::Background,
+ toSQL::string(SQLLock, connection()), par);
+ startQuery();
+ }
+ else
+ {
+ toTreeWidgetItem *cn = NULL;
+ for (toTreeWidgetItem *ci = firstChild(); ci; ci = cn)
{
- item->setText(MARK_COL, QString::fromLatin1("Yes"));
- item->setOpen(true);
- if (!Checked[sid])
+ if (ci != item && ci->text(0) == item->text(0))
{
- Checked[sid] = true;
- LastItem = item;
- toQList par;
- par.insert(par.end(), LastItem->text(0));
- Query = new toNoBlockQuery(connection(), toQuery::Background,
- toSQL::string(SQLLock, connection()), par);
+ if (ci->firstChild())
+ {
+ ci = ci->firstChild();
+ cn = new toResultViewItem(item, NULL);
+ for (int i = 0; i < columns(); i++)
+ cn->setText(i, ci->text(i));
+ }
+ break;
}
+ if (ci->firstChild())
+ {
+ cn = ci->firstChild();
+ }
+ else if (ci->nextSibling())
+ cn = ci->nextSibling();
else
{
- toTreeWidgetItem *cn = NULL;
- for (toTreeWidgetItem *ci = firstChild();ci;ci = cn)
+ cn = ci;
+ do
{
- if (ci != item && ci->text(0) == item->text(0))
- {
- if (ci->firstChild())
- {
- ci = ci->firstChild();
- cn = new toResultViewItem(item, NULL);
- for (int i = 0;i < columns();i++)
- cn->setText(i, ci->text(i));
- }
- break;
- }
- if (ci->firstChild())
- {
- cn = ci->firstChild();
- }
- else if (ci->nextSibling())
- cn = ci->nextSibling();
- else
- {
- cn = ci;
- do
- {
- cn = cn->parent();
- }
- while (cn && !cn->nextSibling());
- if (cn)
- cn = cn->nextSibling();
- }
+ cn = cn->parent();
}
+ while (cn && !cn->nextSibling());
+ if (cn)
+ cn = cn->nextSibling();
}
- break;
}
- if (item->firstChild())
- {
- next = item->firstChild();
- }
- else if (item->nextSibling())
- next = item->nextSibling();
- else
- {
- next = item;
- do
- {
- next = next->parent();
- }
- while (next && !next->nextSibling());
- if (next)
- next = next->nextSibling();
- }
}
- if (!LastItem)
- Poll.stop();
+ break;
}
+ if (item->firstChild())
+ {
+ next = item->firstChild();
+ }
+ else if (item->nextSibling())
+ next = item->nextSibling();
+ else
+ {
+ next = item;
+ do
+ {
+ next = next->parent();
+ }
+ while (next && !next->nextSibling());
+ if (next)
+ next = next->nextSibling();
+ }
}
- catch (const QString &exc)
- {
- delete Query;
- Query = NULL;
- Poll.stop();
- toStatusMessage(exc);
- }
-}
+} // queryDone
Modified: trunk/tora/src/toresultlock.h
===================================================================
--- trunk/tora/src/toresultlock.h 2010-10-17 20:37:19 UTC (rev 3787)
+++ trunk/tora/src/toresultlock.h 2010-10-19 18:48:09 UTC (rev 3788)
@@ -49,16 +49,19 @@
#include "tobackground.h"
#include "toresultview.h"
-class toNoBlockQuery;
+class toEventQuery;
+/**
+ * A result table displaying information about locks in a hierarchy.
+ *
+ */
class toResultLock : public toResultView
{
Q_OBJECT
- toBackground Poll;
- toNoBlockQuery *Query;
- toTreeWidgetItem *LastItem;
- std::map<int, bool> Checked;
+ toEventQuery *Query;
+ toTreeWidgetItem *LastItem; // used to point to parent when polling children records
+ std::map<int, bool> Checked; // list of sessions which have been checked for "children"
public:
toResultLock(QWidget *parent, const char *name = NULL);
~toResultLock();
@@ -73,8 +76,11 @@
/** Support Oracle
*/
virtual bool canHandle(toConnection &conn);
+private:
+ void startQuery(void); // connect signals-slots and start query
private slots:
- void poll(void);
+ void poll(void); // Poll query results
+ void queryDone(void); // Clean up query
};
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2010-11-07 17:29:11
|
Revision: 3800
http://tora.svn.sourceforge.net/tora/?rev=3800&view=rev
Author: tomasstraupis
Date: 2010-11-07 17:29:03 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
Change deprecated toNoBlockQuery to toEventQuery.
Modified Paths:
--------------
trunk/tora/doc/help/template.html
trunk/tora/doc/help/template.texi
trunk/tora/src/totemplate.cpp
trunk/tora/src/totemplate.h
trunk/tora/src/towaitevents.cpp
trunk/tora/src/towaitevents.h
Modified: trunk/tora/doc/help/template.html
===================================================================
--- trunk/tora/doc/help/template.html 2010-11-03 20:11:46 UTC (rev 3799)
+++ trunk/tora/doc/help/template.html 2010-11-07 17:29:03 UTC (rev 3800)
@@ -39,7 +39,7 @@
<p><a name="index-Template-Help-36"></a>
This tool provides help for writing PL/SQL and SQL queries by allowing a non obtrusive database browser and help lookup.
- <p>The template help is implemented as a docked window if these are available. They are available in Qt 3.0 (Released only as beta as of 2001-07-11) and KDE.
+ <p>The template help is implemented as a docked window.
<p>The help browser are divided into two panes. The top pane displays a tree view of the available documentation. The lower is used to display more information about the selected item in the top pane and it's content may differ depending on what is selected.
Modified: trunk/tora/doc/help/template.texi
===================================================================
--- trunk/tora/doc/help/template.texi 2010-11-03 20:11:46 UTC (rev 3799)
+++ trunk/tora/doc/help/template.texi 2010-11-07 17:29:03 UTC (rev 3800)
@@ -4,7 +4,7 @@
This tool provides help for writing PL/SQL and SQL queries by allowing a non obtrusive database browser and help lookup.
-The template help is implemented as a docked window if these are available. They are available in Qt 3.0 (Released only as beta as of 2001-07-11) and KDE.
+The template help is implemented as a docked window.
The help browser are divided into two panes. The top pane displays a tree view of the available documentation. The lower is used to display more information about the selected item in the top pane and it's content may differ depending on what is selected.
Modified: trunk/tora/src/totemplate.cpp
===================================================================
--- trunk/tora/src/totemplate.cpp 2010-11-03 20:11:46 UTC (rev 3799)
+++ trunk/tora/src/totemplate.cpp 2010-11-07 17:29:03 UTC (rev 3800)
@@ -45,7 +45,7 @@
#include "toconnection.h"
#include "tohelp.h"
#include "tomarkedtext.h"
-#include "tonoblockquery.h"
+#include "toeventquery.h"
#include "toresultview.h"
#include "totemplate.h"
#include "totool.h"
@@ -831,7 +831,6 @@
: Parent(parent)
{
Query = NULL;
- connect(&Poll, SIGNAL(timeout()), this, SLOT(poll()));
}
void toTemplateSQL::expand(void)
@@ -847,45 +846,45 @@
{
delete Query;
Query = NULL;
- Query = new toNoBlockQuery(Parent->connection(), toQuery::Background,
+ Query = new toEventQuery(Parent->connection(), toQuery::Background,
Parent->SQL, Parent->parameters());
- Poll.start(100);
+ connect(Query, SIGNAL(dataAvailable()), this, SLOT(poll()));
+ connect(Query, SIGNAL(done()), this, SLOT(queryDone()));
+ Query->readAll(); // indicate that all records should be fetched
+ Query->start();
}
TOCATCH
}
void toTemplateSQLObject::poll(void)
{
+ if (QApplication::activeModalWidget()) // Template is never in widget
+ return;
+
try
{
- if (QApplication::activeModalWidget()) // Template is never in widget
- return ;
- if (Query && Query->poll())
+ toQDescList desc = Query->describe();
+ while (Query->hasMore())
{
- toQDescList desc = Query->describe();
- while (Query->poll() && !Query->eof())
- {
- toTreeWidgetItem *item = Parent->createChild(Query->readValue());
- for (unsigned int j = 1;j < desc.size();j++)
- item->setText(j, Query->readValue());
- }
- if (Query->eof())
- {
- delete Query;
- Query = NULL;
- Poll.stop();
- }
+ toTreeWidgetItem *item = Parent->createChild(Query->readValue());
+ for (unsigned int j = 1; j < desc.size(); j++)
+ item->setText(j, Query->readValue());
}
}
catch (const QString &str)
{
delete Query;
Query = NULL;
- Poll.stop();
toStatusMessage(str);
}
-}
+} // poll
+void toTemplateSQLObject::queryDone(void )
+{
+ delete Query;
+ Query = NULL;
+} // queryDone
+
toTemplateSQLObject::~toTemplateSQLObject()
{
delete Query;
Modified: trunk/tora/src/totemplate.h
===================================================================
--- trunk/tora/src/totemplate.h 2010-11-03 20:11:46 UTC (rev 3799)
+++ trunk/tora/src/totemplate.h 2010-11-07 17:29:03 UTC (rev 3800)
@@ -42,8 +42,6 @@
#ifndef TOTEMPLATE_H
#define TOTEMPLATE_H
-#include "config.h"
-#include "tobackground.h"
#include "tohelp.h"
#include "toresultview.h"
// due the TODock
@@ -69,7 +67,7 @@
class toListView;
class toTemplateItem;
class toTemplateProvider;
-class toNoBlockQuery;
+class toEventQuery;
/** Not part of the API.
* @internal
@@ -273,8 +271,7 @@
{
Q_OBJECT;
- toNoBlockQuery *Query;
- toBackground Poll;
+ toEventQuery *Query;
toTemplateSQL *Parent;
toTemplateSQLObject(toTemplateSQL *parent);
virtual ~toTemplateSQLObject();
@@ -283,6 +280,7 @@
friend class toTemplateSQL;
private slots:
void poll(void);
+ void queryDone(void);
};
/** This class represent an item that when expanded will execute an SQL statement
Modified: trunk/tora/src/towaitevents.cpp
===================================================================
--- trunk/tora/src/towaitevents.cpp 2010-11-03 20:11:46 UTC (rev 3799)
+++ trunk/tora/src/towaitevents.cpp 2010-11-07 17:29:03 UTC (rev 3800)
@@ -43,7 +43,7 @@
#include "toconf.h"
#include "toconnection.h"
-#include "tonoblockquery.h"
+#include "toeventquery.h"
#include "topiechart.h"
#include "toresultbar.h"
#include "toresultview.h"
@@ -212,7 +212,6 @@
AbsolutePie->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
AbsolutePie->showLegend(false);
layout->addWidget(AbsolutePie, 1, 1);
- connect(&Poll, SIGNAL(timeout()), this, SLOT(poll()));
Query = NULL;
start();
try
@@ -236,9 +235,7 @@
splitter->restoreState(ba);
LastTime = 0;
-
-
First = true;
ShowTimes = false;
}
@@ -276,7 +273,6 @@
Relative.clear();
RelativeTimes.clear();
Enabled.clear();
- Poll.stop();
delete Query;
Query = NULL;
refresh();
@@ -410,153 +406,150 @@
void toWaitEvents::poll(void)
{
+ if (!toCheckModal(this))
+ return;
+
try
{
- if (!toCheckModal(this))
- return ;
- if (Query && Query->poll())
+ while (Query->hasMore())
{
- while (Query->poll() && !Query->eof())
+ QString cur = Query->readValueNull();
+ Now = Query->readValueNull();
+ if (First)
{
- QString cur = Query->readValueNull();
- Now = Query->readValueNull();
- if (First)
- {
- Labels.insert(Labels.end(), cur);
- Current.insert(Current.end(), Query->readValueNull().toDouble());
- CurrentTimes.insert(CurrentTimes.end(), Query->readValueNull().toDouble());
- }
- else
- {
- double val = Query->readValueNull().toDouble();
- double tim = Query->readValueNull().toDouble();
- std::list<double>::iterator i = Current.begin();
- std::list<double>::iterator j = CurrentTimes.begin();
- std::list<QString>::iterator k = Labels.begin();
- while (i != Current.end() && j != CurrentTimes.end() && k != Labels.end())
- {
- if (*k == cur)
- {
- *i = val;
- *j = tim;
- break;
- }
- i++;
- j++;
- k++;
- }
- }
- Query->readValueNull().toDouble();
+ Labels.insert(Labels.end(), cur);
+ Current.insert(Current.end(), Query->readValueNull().toDouble());
+ CurrentTimes.insert(CurrentTimes.end(), Query->readValueNull().toDouble());
}
- if (Query->eof())
+ else
{
- std::map<QString, bool> types;
- toTreeWidgetItem *item = NULL;
+ double val = Query->readValueNull().toDouble();
+ double tim = Query->readValueNull().toDouble();
+ std::list<double>::iterator i = Current.begin();
+ std::list<double>::iterator j = CurrentTimes.begin();
+ std::list<QString>::iterator k = Labels.begin();
+ while (i != Current.end() && j != CurrentTimes.end() && k != Labels.end())
{
- for (toTreeWidgetItem *ci = Types->firstChild();ci;ci = ci->nextSibling())
+ if (*k == cur)
{
- types[ci->text(1)] = true;
- item = ci;
+ *i = val;
+ *j = tim;
+ break;
}
+ i++;
+ j++;
+ k++;
}
+ }
+ Query->readValueNull().toDouble();
+ }
+ }
+ catch (const QString &exc)
+ {
+ delete Query;
+ Query = NULL;
+ toStatusMessage(exc);
+ }
+}
- {
- std::list<double>::iterator j = CurrentTimes.begin();
- for (std::list<QString>::iterator i = Labels.begin();i != Labels.end();i++, j++)
- {
- if ((*j) != 0 && types.find(*i) == types.end())
- {
- item = new toWaitEventsItem(Types, item, *i);
- item->setSelected(First && HideMap.find(*i) == HideMap.end());
- types[*i] = true;
- }
- }
- }
- if (First)
- {
- Delta->setLabels(Labels);
- DeltaTimes->setLabels(Labels);
- First = false;
- }
+void toWaitEvents::queryDone(void )
+{
+ std::map<QString, bool> types;
+ toTreeWidgetItem *item = NULL;
+ {
+ for (toTreeWidgetItem *ci = Types->firstChild(); ci; ci = ci->nextSibling())
+ {
+ types[ci->text(1)] = true;
+ item = ci;
+ }
+ }
- time_t now = time(NULL);
+ {
+ std::list<double>::iterator j = CurrentTimes.begin();
+ for (std::list<QString>::iterator i = Labels.begin();i != Labels.end();i++, j++)
+ {
+ if ((*j) != 0 && types.find(*i) == types.end())
+ {
+ item = new toWaitEventsItem(Types, item, *i);
+ item->setSelected(First && HideMap.find(*i) == HideMap.end());
+ types[*i] = true;
+ }
+ }
+ }
+ if (First)
+ {
+ Delta->setLabels(Labels);
+ DeltaTimes->setLabels(Labels);
+ First = false;
+ }
- for (toTreeWidgetItem *ci = Types->firstChild();ci;ci = ci->nextSibling())
- {
- toWaitEventsItem * item = dynamic_cast<toWaitEventsItem *>(ci);
- if (item)
- {
- int col = 0;
- std::list<double>::iterator i = Current.begin();
- std::list<double>::iterator j = CurrentTimes.begin();
- std::list<QString>::iterator k = Labels.begin();
- while (i != Current.end() && j != CurrentTimes.end() && k != Labels.end())
- {
- if (item->text(1) == *k)
- {
- item->setColor(col);
- item->setText(2, QString::number((*i - item->text(3).toDouble()) / std::max(int(now - LastTime), 1)));
- item->setText(3, QString::number(*i));
- item->setText(4, QString::number((*j - item->text(5).toDouble()) / std::max(int(now - LastTime), 1)));
- item->setText(5, QString::number(*j));
- break;
- }
- col++;
- i++;
- j++;
- k++;
- }
- }
- }
+ time_t now = time(NULL);
- Relative.clear();
- RelativeTimes.clear();
-
- std::list<double>::iterator j = LastCurrent.begin();
- std::list<double>::iterator i = Current.begin();
- while (i != Current.end() && j != LastCurrent.end())
+ for (toTreeWidgetItem *ci = Types->firstChild(); ci; ci = ci->nextSibling())
+ {
+ toWaitEventsItem * item = dynamic_cast<toWaitEventsItem *>(ci);
+ if (item)
+ {
+ int col = 0;
+ std::list<double>::iterator i = Current.begin();
+ std::list<double>::iterator j = CurrentTimes.begin();
+ std::list<QString>::iterator k = Labels.begin();
+ while (i != Current.end() && j != CurrentTimes.end() && k != Labels.end())
+ {
+ if (item->text(1) == *k)
{
- Relative.insert(Relative.end(), ((*i) - (*j)) / std::max(int(now - LastTime), 1));
- i++;
- j++;
+ item->setColor(col);
+ item->setText(2, QString::number((*i - item->text(3).toDouble()) / std::max(int(now - LastTime), 1)));
+ item->setText(3, QString::number(*i));
+ item->setText(4, QString::number((*j - item->text(5).toDouble()) / std::max(int(now - LastTime), 1)));
+ item->setText(5, QString::number(*j));
+ break;
}
+ col++;
+ i++;
+ j++;
+ k++;
+ }
+ }
+ }
- j = LastTimes.begin();
- i = CurrentTimes.begin();
- while (i != CurrentTimes.end() && j != LastTimes.end())
- {
- RelativeTimes.insert(RelativeTimes.end(), ((*i) - (*j)) / std::max(int(now - LastTime), 1));
- i++;
- j++;
- }
+ Relative.clear();
+ RelativeTimes.clear();
- LastTime = now;
- LastTimes = CurrentTimes;
- LastCurrent = Current;
+ std::list<double>::iterator j = LastCurrent.begin();
+ std::list<double>::iterator i = Current.begin();
+ while (i != Current.end() && j != LastCurrent.end())
+ {
+ Relative.insert(Relative.end(), ((*i) - (*j)) / std::max(int(now - LastTime), 1));
+ i++;
+ j++;
+ }
- if (Relative.begin() != Relative.end())
- {
- Delta->addValues(Relative, Now);
- DeltaTimes->addValues(RelativeTimes, Now);
- }
+ j = LastTimes.begin();
+ i = CurrentTimes.begin();
+ while (i != CurrentTimes.end() && j != LastTimes.end())
+ {
+ RelativeTimes.insert(RelativeTimes.end(), ((*i) - (*j)) / std::max(int(now - LastTime), 1));
+ i++;
+ j++;
+ }
- changeSelection();
+ LastTime = now;
+ LastTimes = CurrentTimes;
+ LastCurrent = Current;
- delete Query;
- Query = NULL;
- Poll.stop();
- }
- }
- }
- catch (const QString &exc)
+ if (Relative.begin() != Relative.end())
{
- delete Query;
- Query = NULL;
- Poll.stop();
- toStatusMessage(exc);
+ Delta->addValues(Relative, Now);
+ DeltaTimes->addValues(RelativeTimes, Now);
}
-}
+ changeSelection();
+
+ delete Query;
+ Query = NULL;
+} // queryDone
+
static toSQL SQLSessionWaitEvents("toWaitEvents:Session",
"SELECT b.name,\n"
" SYSDATE,\n"
@@ -648,9 +641,11 @@
}
else
sql = toSQL::string(SQLWaitEvents, conn);
- Query = new toNoBlockQuery(conn, sql, par);
-
- Poll.start(100);
+ Query = new toEventQuery(conn, sql, par);
+ connect(Query, SIGNAL(dataAvailable()), this, SLOT(poll()));
+ connect(Query, SIGNAL(done()), this, SLOT(queryDone()));
+ Query->readAll(); // indicate that all records should be fetched
+ Query->start();
}
TOCATCH
}
Modified: trunk/tora/src/towaitevents.h
===================================================================
--- trunk/tora/src/towaitevents.h 2010-11-03 20:11:46 UTC (rev 3799)
+++ trunk/tora/src/towaitevents.h 2010-11-07 17:29:03 UTC (rev 3800)
@@ -42,9 +42,6 @@
#ifndef TOWAITEVENTS_H
#define TOWAITEVENTS_H
-#include "config.h"
-#include "tobackground.h"
-
#include <list>
#include <map>
#include <algorithm>
@@ -53,7 +50,7 @@
#include <QString>
class toTreeWidget;
-class toNoBlockQuery;
+class toEventQuery;
class toPieChart;
class toResultBar;
class QSplitter;
@@ -69,8 +66,7 @@
toPieChart *AbsolutePie;
toPieChart *DeltaPie;
toTreeWidget *Types;
- toNoBlockQuery *Query;
- toBackground Poll;
+ toEventQuery *Query;
bool First;
bool ShowTimes;
@@ -103,6 +99,7 @@
virtual void connectionChanged(void);
virtual void changeSelection(void);
virtual void poll(void);
+ virtual void queryDone(void);
virtual void refresh(void);
virtual void start(void);
virtual void stop(void);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2010-11-18 11:52:22
|
Revision: 3812
http://tora.svn.sourceforge.net/tora/?rev=3812&view=rev
Author: ibre5041
Date: 2010-11-18 11:52:13 +0000 (Thu, 18 Nov 2010)
Log Message:
-----------
- nullity handling changed
- readValue and readValueNull joined
- toQValue has new methods: displayData, editData, userData
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/src/toanalyze.cpp
trunk/tora/src/tobrowserdblinkswidget.cpp
trunk/tora/src/tobrowsertable.cpp
trunk/tora/src/tocodemodel.cpp
trunk/tora/src/toconnection.cpp
trunk/tora/src/toconnection.h
trunk/tora/src/todebug.cpp
trunk/tora/src/toeventquery.cpp
trunk/tora/src/toeventquery.h
trunk/tora/src/toeventquerytask.cpp
trunk/tora/src/tologger.h
trunk/tora/src/tooracleconnection.cpp
trunk/tora/src/tooracleconnection_trotl.cpp
trunk/tora/src/tooracleextract.cpp
trunk/tora/src/tooutput.cpp
trunk/tora/src/toprofiler.cpp
trunk/tora/src/toqsqlconnection.cpp
trunk/tora/src/toqvalue.cpp
trunk/tora/src/toqvalue.h
trunk/tora/src/toresultcols.cpp
trunk/tora/src/toresultmodel.cpp
trunk/tora/src/toresultpie.cpp
trunk/tora/src/toresultplan.cpp
trunk/tora/src/toresultstorage.cpp
trunk/tora/src/toresulttableviewedit.cpp
trunk/tora/src/toscripttreemodel.cpp
trunk/tora/src/tosecuritytreemodel.cpp
trunk/tora/src/tostorage.cpp
trunk/tora/src/totuning.cpp
trunk/tora/src/towaitevents.cpp
trunk/tora/src/utils.cpp
trunk/tora/src/utils.h
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/CMakeLists.txt 2010-11-18 11:52:13 UTC (rev 3812)
@@ -126,8 +126,8 @@
SET(ARCH_PPC 1)
ENDIF (_machine_ppc)
-SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
-SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -ggdb3")
+SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -ggdb3")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic")
SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3 -fno-inline -rdynamic")
Modified: trunk/tora/src/toanalyze.cpp
===================================================================
--- trunk/tora/src/toanalyze.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/toanalyze.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -534,7 +534,7 @@
{
int cols = q->describe().size();
for (int j = 0; j < cols; j++)
- q->readValueNull(); // Eat the output if any.
+ q->readValue(); // Eat the output if any.
Current->setText(tr("Running %1 Pending %2").arg(Running.size()).arg(Pending.size()));
}
@@ -652,7 +652,7 @@
break;
}
QString owner = Statistics->model()->data((*it).row(), 2).toString();
- if (toUnnull(owner).isNull())
+ if (owner.isNull())
owner = Schema->selected();
ret.append(sql.arg(owner).arg(
Statistics->model()->data((*it).row(), 1).toString()));
Modified: trunk/tora/src/tobrowserdblinkswidget.cpp
===================================================================
--- trunk/tora/src/tobrowserdblinkswidget.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/tobrowserdblinkswidget.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -103,8 +103,8 @@
toQList resultset;
try
{
- resultset = toQuery::readQueryNull(toCurrentConnection(this),
- "SELECT * FROM dual@" + object());
+ resultset = toQuery::readQuery(toCurrentConnection(this),
+ "SELECT * FROM dual@" + object());
}
TOCATCH;
Modified: trunk/tora/src/tobrowsertable.cpp
===================================================================
--- trunk/tora/src/tobrowsertable.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/tobrowsertable.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -334,7 +334,7 @@
toQuery query(connection(), SQLListTablespaces); // TODO: does this create NEW connection??!!
while (!query.eof())
{
- QString t = query.readValueNull();
+ QString t = query.readValue();
Tablespace->addItem(t);
if (t == tablespace)
Tablespace->setCurrentIndex(Tablespace->count() - 1);
Modified: trunk/tora/src/tocodemodel.cpp
===================================================================
--- trunk/tora/src/tocodemodel.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/tocodemodel.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -459,8 +459,8 @@
emit layoutAboutToBeChanged();
while (!query.eof())
{
- ctype = query.readValueNull();
- cstatus = query.readValueNull();
+ ctype = query.readValue();
+ cstatus = query.readValue();
new toCodeModelItem(item, ctype, ctype, cstatus);
// "inherit" child status for parent if it's required
@@ -498,9 +498,9 @@
while(query->hasMore())
{
- QString cname = query->readValueNull().toString();
- QString ctype = query->readValueNull().toString();
- QString cstatus = query->readValueNull().toString();
+ QString cname = query->readValue();
+ QString ctype = query->readValue();
+ QString cstatus = query->readValue();
toCodeModelItem *item = 0;
if(ctype == QString("PACKAGE"))
Modified: trunk/tora/src/toconnection.cpp
===================================================================
--- trunk/tora/src/toconnection.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/toconnection.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -651,55 +651,6 @@
return ret;
}
-toQList toQuery::readQueryNull(toConnection &conn, const toSQL &sql, toQList ¶ms)
-{
- toBusy busy;
- toQuery query(conn, sql, params);
- toQList ret;
- while (!query.eof())
- ret.insert(ret.end(), query.readValueNull());
- return ret;
-}
-
-toQList toQuery::readQueryNull(toConnection &conn, const QString &sql, toQList ¶ms)
-{
- toQuery query(conn, sql, params);
- toQList ret;
- while (!query.eof())
- ret.insert(ret.end(), query.readValueNull());
- return ret;
-}
-
-toQList toQuery::readQueryNull(toConnection &conn, const toSQL &sql,
- const QString &arg1, const QString &arg2,
- const QString &arg3, const QString &arg4,
- const QString &arg5, const QString &arg6,
- const QString &arg7, const QString &arg8,
- const QString &arg9)
-{
- toBusy busy;
- toQuery query(conn, sql, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
- toQList ret;
- while (!query.eof())
- ret.insert(ret.end(), query.readValueNull());
- return ret;
-}
-
-toQList toQuery::readQueryNull(toConnection &conn, const QString &sql,
- const QString &arg1, const QString &arg2,
- const QString &arg3, const QString &arg4,
- const QString &arg5, const QString &arg6,
- const QString &arg7, const QString &arg8,
- const QString &arg9)
-{
- toBusy busy;
- toQuery query(conn, sql, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
- toQList ret;
- while (!query.eof())
- ret.insert(ret.end(), query.readValueNull());
- return ret;
-}
-
toQValue toQuery::readValue(void)
{
if (!Connection)
@@ -707,16 +658,6 @@
if (Connection->Abort)
throw qApp->translate("toQuery", "Query aborted");
- return toNull(Query->readValue());
-}
-
-toQValue toQuery::readValueNull(void)
-{
- if (!Connection)
- return toQValue(0);
-
- if (Connection->Abort)
- throw qApp->translate("toQuery", "Query aborted");
return Query->readValue();
}
Modified: trunk/tora/src/toconnection.h
===================================================================
--- trunk/tora/src/toconnection.h 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/toconnection.h 2010-11-18 11:52:13 UTC (rev 3812)
@@ -394,14 +394,10 @@
return Mode;
}
- /** Read a value from the query. Convert the value NULL to the string {null}.
+ /** Read a value from the query.
* @return Value read.
*/
toQValue readValue(void);
- /** Read a value from the query. Nulls are returned as empty @ref toQValue.
- * @return Value read.
- */
- toQValue readValueNull(void);
/** Check if end of query is reached.
* @return True if end of query is reached.
*/
@@ -477,48 +473,7 @@
const QString &arg5 = QString::null, const QString &arg6 = QString::null,
const QString &arg7 = QString::null, const QString &arg8 = QString::null,
const QString &arg9 = QString::null);
- /** Execute a query and return all the values returned by it.
- * @param conn Connection to run query on.
- * @param sql SQL to run.
- * @param params Parameters to pass to query.
- * @return A list of @ref toQValues:s read from the query.
- */
- static std::list<toQValue> readQueryNull(toConnection &conn,
- const toSQL &sql,
- std::list<toQValue> ¶ms);
- /** Execute a query and return all the values returned by it.
- * @param conn Connection to run query on.
- * @param sql SQL to run.
- * @param params Parameters to pass to query.
- * @return A list of @ref toQValues:s read from the query.
- */
- static std::list<toQValue> readQueryNull(toConnection &conn,
- const QString &sql,
- std::list<toQValue> ¶ms);
- /** Execute a query and return all the values returned by it.
- * @param conn Connection to run query on.
- * @param sql SQL to run.
- * @param arg1 Parameters to pass to query.
- * @return A list of @ref toQValues:s read from the query.
- */
- static std::list<toQValue> readQueryNull(toConnection &conn, const toSQL &sql,
- const QString &arg1 = QString::null, const QString &arg2 = QString::null,
- const QString &arg3 = QString::null, const QString &arg4 = QString::null,
- const QString &arg5 = QString::null, const QString &arg6 = QString::null,
- const QString &arg7 = QString::null, const QString &arg8 = QString::null,
- const QString &arg9 = QString::null);
- /** Execute a query and return all the values returned by it.
- * @param conn Connection to run query on.
- * @param sql SQL to run.
- * @param arg1 Parameters to pass to query.
- * @return A list of @ref toQValues:s read from the query.
- */
- static std::list<toQValue> readQueryNull(toConnection &conn, const QString &sql,
- const QString &arg1 = QString::null, const QString &arg2 = QString::null,
- const QString &arg3 = QString::null, const QString &arg4 = QString::null,
- const QString &arg5 = QString::null, const QString &arg6 = QString::null,
- const QString &arg7 = QString::null, const QString &arg8 = QString::null,
- const QString &arg9 = QString::null);
+
/** Cancel the current execution of a query.
*/
void cancel(void);
Modified: trunk/tora/src/todebug.cpp
===================================================================
--- trunk/tora/src/todebug.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/todebug.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -140,7 +140,7 @@
#ifdef DEBUG
// perform self-check (should probably display scary message and close if this test fails)
toQuery selfCheck(connection, SQLDebugSelfCheck);
- QString str = selfCheck.readValueNull();
+ QString str = selfCheck.readValue();
qDebug() << "DBMS_DEBUG.SELF_CHECK result: " << str;
#endif
@@ -402,7 +402,7 @@
{
outputSession->execute(SQLDebugOutputPoll);
ret = outputSession->readValue().toInt();
- QString str = outputSession->readValueNull();
+ QString str = outputSession->readValue();
if (ret == 0 || str.length())
insertLine(str);
}
Modified: trunk/tora/src/toeventquery.cpp
===================================================================
--- trunk/tora/src/toeventquery.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/toeventquery.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -49,7 +49,7 @@
#include "torunnable.h"
-toQValue toEventQuery::readValueNull() {
+toQValue toEventQuery::readValue() {
if(Values.isEmpty())
throw tr("Read past end of query");
@@ -62,11 +62,6 @@
}
-toQValue toEventQuery::readValue() {
- return toNull(readValueNull());
-}
-
-
toEventQuery::toEventQuery(toConnection &conn,
const QString &sql,
const toQList ¶m,
Modified: trunk/tora/src/toeventquery.h
===================================================================
--- trunk/tora/src/toeventquery.h 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/toeventquery.h 2010-11-18 11:52:13 UTC (rev 3812)
@@ -177,9 +177,9 @@
*
* @return The next available value.
*/
- toQValue readValueNull(void);
+ //toQValue readValueNull(void);
+
-
/**
* Get the number of rows processed.
*
Modified: trunk/tora/src/toeventquerytask.cpp
===================================================================
--- trunk/tora/src/toeventquerytask.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/toeventquerytask.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -207,7 +207,7 @@
for(int row = 0; row < maxRead; row++) {
for(int i = 0; i < Columns && !Query->eof(); i++)
- values.append(Query->readValueNull());
+ values.append(Query->readValue());
}
if(values.size() > 0)
Modified: trunk/tora/src/tologger.h
===================================================================
--- trunk/tora/src/tologger.h 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/tologger.h 2010-11-18 11:52:13 UTC (rev 3812)
@@ -67,14 +67,14 @@
}
// tonoblockquery<4> - data read(disabled)
-template<>
-inline thread_safe_log templ_get_log_ownthread(int_to_type<4>*)
-{
- static s_null_sink nsink;
- static std::ostream out(&nsink);
- static internal_thread_safe_log_ownthread log( out );
- return thread_safe_log( log);
-}
+/* template<> */
+/* inline thread_safe_log templ_get_log_ownthread(int_to_type<4>*) */
+/* { */
+/* static s_null_sink nsink; */
+/* static std::ostream out(&nsink); */
+/* static internal_thread_safe_log_ownthread log( out ); */
+/* return thread_safe_log( log); */
+/* } */
/*
thread_safe_log templ_get_log_ownthread<1>( int_to_type< 1> * = NULL )
Modified: trunk/tora/src/tooracleconnection.cpp
===================================================================
--- trunk/tora/src/tooracleconnection.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/tooracleconnection.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -73,7 +73,7 @@
#endif
#endif
-#if 0 /* OTL tracing */
+#if 1 /* OTL tracing */
#define OTL_TRACE_LEVEL 0xff
#define OTL_TRACE_STREAM cerr
#include <iostream>
@@ -691,10 +691,10 @@
toConnection::objectName cur;
while (!objects.eof())
{
- cur.Owner = objects.readValueNull();
- cur.Name = objects.readValueNull();
- cur.Type = objects.readValueNull();
- cur.Comment = objects.readValueNull();
+ cur.Owner = objects.readValue();
+ cur.Name = objects.readValue();
+ cur.Type = objects.readValue();
+ cur.Comment = objects.readValue();
ret.insert(ret.end(), cur);
}
@@ -713,9 +713,9 @@
std::list<toConnection::objectName>::iterator i = objects.begin();
while (!synonyms.eof())
{
- QString synonym = synonyms.readValueNull();
- cur.Owner = synonyms.readValueNull();
- cur.Name = synonyms.readValueNull();
+ QString synonym = synonyms.readValue();
+ cur.Owner = synonyms.readValue();
+ cur.Name = synonyms.readValue();
while (i != objects.end() && (*i) < cur)
i++;
if (i == objects.end())
@@ -748,8 +748,8 @@
{
QString name = member.readValue();
QString overld = member.readValue();
- QString arg = member.readValueNull();
- QString type = member.readValueNull();
+ QString arg = member.readValue();
+ QString type = member.readValue();
if (lastName != name || overld != lastOver)
{
if (hasArgs)
@@ -801,7 +801,7 @@
while (!comment.eof())
{
QString col = comment.readValue();
- comments[col] = comment.readValueNull();
+ comments[col] = comment.readValue();
}
}
catch (...)
@@ -1174,13 +1174,13 @@
case otl_var_varchar_long:
case otl_var_clob:
{
- QString buf = (*i).toUtf8();
+ QString buf = (*i).editData();
otl_long_string str(buf.toUtf8().constData(), buf.length(), buf.length());
(*Query) << str;
}
break;
default:
- (*Query) << (*i).toUtf8().toUtf8().constData();
+ (*Query) << (*i).editData().toUtf8().constData();
break;
}
}
Modified: trunk/tora/src/tooracleconnection_trotl.cpp
===================================================================
--- trunk/tora/src/tooracleconnection_trotl.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/tooracleconnection_trotl.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -933,10 +933,10 @@
toConnection::objectName cur;
while (!objects.eof())
{
- cur.Owner = objects.readValueNull();
- cur.Name = objects.readValueNull();
- cur.Type = objects.readValueNull();
- cur.Comment = objects.readValueNull();
+ cur.Owner = objects.readValue();
+ cur.Name = objects.readValue();
+ cur.Type = objects.readValue();
+ cur.Comment = objects.readValue();
ret.insert(ret.end(), cur);
}
TLOG(0,toDecorator,__HERE__)
@@ -958,9 +958,9 @@
std::list<toConnection::objectName>::iterator i = objects.begin();
while (!synonyms.eof())
{
- QString synonym = synonyms.readValueNull();
- cur.Owner = synonyms.readValueNull();
- cur.Name = synonyms.readValueNull();
+ QString synonym = synonyms.readValue();
+ cur.Owner = synonyms.readValue();
+ cur.Name = synonyms.readValue();
while (i != objects.end() && (*i) < cur)
i++;
if (i == objects.end())
@@ -996,8 +996,8 @@
{
QString name = member.readValue();
QString overld = member.readValue();
- QString arg = member.readValueNull();
- QString type = member.readValueNull();
+ QString arg = member.readValue();
+ QString type = member.readValue();
if (lastName != name || overld != lastOver)
{
if (hasArgs)
@@ -1051,7 +1051,7 @@
while (!comment.eof())
{
QString col = comment.readValue();
- comments[col] = comment.readValueNull();
+ comments[col] = comment.readValue();
}
}
catch (...)
@@ -1469,13 +1469,13 @@
} else if( (bp.bind_typename == "char" || bp.bind_typename == "varchar")
&& ((*i).isString() || (*i).isNumber() || (*i).isNull() ))
{
- std::string param((const char*)((*i).toString().toUtf8().constData()));
- (*Query) << ::std::string((const char*)((*i).toString().toUtf8().constData()));
+ std::string param((const char*)(((QString)*i).toUtf8().constData()));
+ (*Query) << param;
TLOG(0,toDecorator,__HERE__)
<< "<<(conn=" << conn->_conn << ", this=" << Query << ")"
<< "::operator<<(" << bp.type_name << " ftype=" << bp.dty
<< ", placeholder=" << bp.bind_name
- << ", value=" << ::std::string((const char*)((*i).toString().toUtf8().constData())) << ");"
+ << ", value=" << ::std::string((const char*)(((QString)*i).toUtf8().constData())) << ");"
<< "\t of:" << query()->params().size() << std::endl;
} else {
TLOG(0,toDecorator,__HERE__)
@@ -1484,7 +1484,7 @@
<< "<<(conn=" << conn->_conn << ", this=" << Query << ")"
<< "::operator<<(" << bp.type_name << " ftype=" << bp.dty
<< ", placeholder=" << bp.bind_name
- << ", value=" << ::std::string((const char*)((*i).toString().toUtf8().constData())) << ");"
+ << ", value=" << ::std::string((const char*)(((QString)*i).toUtf8().constData())) << ");"
<< "\t of:" << query()->params().size() << std::endl;
throw toConnection::exception(
QString::fromLatin1("Fatal pruser error - unsupported BindPar:%1\nFor SQL:\n%2\n")
Modified: trunk/tora/src/tooracleextract.cpp
===================================================================
--- trunk/tora/src/tooracleextract.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/tooracleextract.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -393,7 +393,7 @@
bool isDBA = true;
try
{
- resultset = toQuery::readQueryNull(CONNECTION,
+ resultset = toQuery::readQuery(CONNECTION,
"SELECT * FROM ctxsys.ctx_indexes "
"WHERE idx_owner = 'DUMMY'");
}
@@ -407,10 +407,10 @@
for (it = ql.begin();it != ql.end();++it)
{
if (isDBA)
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoDBA,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoDBA,
owner, name, *it);
else
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfo,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfo,
name, *it);
if (!resultset.empty())
{
@@ -443,10 +443,10 @@
// some preferences don't have any attributes and
// so won't be caught above
if (isDBA)
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoNoAttrDBA,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoNoAttrDBA,
owner, name, *it);
else
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoNoAttr,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoNoAttr,
name, *it);
if (!resultset.empty())
{
@@ -463,10 +463,10 @@
// Now get the stoplist
if (isDBA)
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoDBA,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoDBA,
owner, name, "STOPLIST");
else
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfo,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfo,
name, "STOPLIST");
pre_name = "";
while (!resultset.empty())
@@ -497,10 +497,10 @@
// When everybody is out to get you paranoia just seems like a good idea.
if (isDBA)
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoNoAttrDBA,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoNoAttrDBA,
owner, name, "STOPLIST");
else
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoNoAttr,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoNoAttr,
name, "STOPLIST");
if (!resultset.empty())
@@ -517,10 +517,10 @@
// get the section_groups
if (isDBA)
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoDBA,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoDBA,
owner, name, "SECTION_GROUP");
else
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfo,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfo,
name, "SECTION_GROUP");
pre_name = "";
while (!resultset.empty())
@@ -562,10 +562,10 @@
else
{
if (isDBA)
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoNoAttrDBA,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoNoAttrDBA,
owner, name, "SECTION_GROUP");
else
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextInfoNoAttr,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextInfoNoAttr,
name, "SECTION_GROUP");
if (!resultset.empty())
{
@@ -584,10 +584,10 @@
if (CONNECTION.version() >= "080106")
{
if (isDBA)
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextColumnDBA,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextColumnDBA,
owner, name);
else
- resultset = toQuery::readQueryNull(CONNECTION, SQLContextColumn,
+ resultset = toQuery::readQuery(CONNECTION, SQLContextColumn,
name);
if (!resultset.empty())
{
@@ -742,12 +742,12 @@
QString toOracleExtract::createIOT(toExtract &ext, const QString &schema, const QString &owner,
const QString &name) const
{
- toQList storage = toQuery::readQueryNull(CONNECTION, SQLIOTInfo, name, owner);
+ toQList storage = toQuery::readQuery(CONNECTION, SQLIOTInfo, name, owner);
QString ret = createTableText(ext, storage, schema, owner, name);
if (ext.getStorage())
{
- toQList overflow = toQuery::readQueryNull(CONNECTION, segments(ext, SQLOverflowInfo), name, owner);
+ toQList overflow = toQuery::readQuery(CONNECTION, segments(ext, SQLOverflowInfo), name, owner);
if (overflow.size() == 18)
{
ret += "OVERFLOW\n";
@@ -788,7 +788,7 @@
ret += tableColumns(ext, owner, name);
if (organization == "INDEX" && ext.getStorage())
{
- toQList res = toQuery::readQueryNull(CONNECTION, SQLPrimaryKey, name, owner);
+ toQList res = toQuery::readQuery(CONNECTION, SQLPrimaryKey, name, owner);
if (res.size() != 2)
throw qApp->translate("toOracleExtract", "Couldn't find primary key of %1.%2").arg(owner).arg(name);
QString primary = *(res.begin());
@@ -891,7 +891,7 @@
const QString &name,
const QString &type) const
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLMViewInfo, name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, SQLMViewInfo, name, owner);
if (result.empty())
throw qApp->translate("toOracleExtract", "Couldn't find materialised table %1.%2").
arg(QUOTE(owner)).arg(QUOTE(name));
@@ -1034,7 +1034,7 @@
const QString &name,
const QString &type) const
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLSnapshotInfo, name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, SQLSnapshotInfo, name, owner);
if (result.size() != 4)
throw qApp->translate("toOracleExtract", "Couldn't find log %1.%2").arg(owner).arg(name);
@@ -1298,12 +1298,12 @@
const QString &owner,
const QString &name) const
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLPartitionedIOTInfo,
+ toQList result = toQuery::readQuery(CONNECTION, SQLPartitionedIOTInfo,
QString::number(ext.getBlockSize()), name, owner);
QString ret = createTableText(ext, result, schema, owner, name);
if (ext.getStorage())
{
- toQList overflow = toQuery::readQueryNull(CONNECTION, segments(ext, SQLOverflowInfo), name, owner);
+ toQList overflow = toQuery::readQuery(CONNECTION, segments(ext, SQLOverflowInfo), name, owner);
if (overflow.size() == 18)
{
ret += "OVERFLOW\n";
@@ -1539,7 +1539,7 @@
return "";
QString ret = sql;
- toQList result = toQuery::readQueryNull(CONNECTION, SQLIndexPartition,
+ toQList result = toQuery::readQuery(CONNECTION, SQLIndexPartition,
QString::number(ext.getBlockSize()), name, owner);
QString partitionType = toShift(result);
QString subPartitionType = toShift(result);
@@ -1869,7 +1869,7 @@
const QString &owner,
const QString &name) const
{
- toQList storage = toQuery::readQueryNull(CONNECTION, SQLPartitionTableInfo,
+ toQList storage = toQuery::readQuery(CONNECTION, SQLPartitionTableInfo,
QString::number(ext.getBlockSize()), name, owner);
QString organization;
@@ -1886,7 +1886,7 @@
if (ext.getPartition())
{
- toQList type = toQuery::readQueryNull(CONNECTION, SQLPartitionType, name, owner);
+ toQList type = toQuery::readQuery(CONNECTION, SQLPartitionType, name, owner);
QString partitionType (toShift(type));
QString partitionCount (toShift(type));
QString subPartitionType (toShift(type));
@@ -1908,7 +1908,7 @@
}
ret += "(\n";
- toQList segment = toQuery::readQueryNull(CONNECTION, SQLPartitionSegment, name, owner);
+ toQList segment = toQuery::readQuery(CONNECTION, SQLPartitionSegment, name, owner);
QString comma = " ";
while (!segment.empty())
@@ -1931,7 +1931,7 @@
if (subPartitionType == "HASH")
{
- toQList subs = toQuery::readQueryNull(CONNECTION, SQLSubPartitionName,
+ toQList subs = toQuery::readQuery(CONNECTION, SQLSubPartitionName,
name, partition, owner);
bool first = true;
ret += " (\n ";
@@ -1951,7 +1951,7 @@
}
else
{
- toQList hash = toQuery::readQueryNull(CONNECTION, SQLPartitionName, name, owner);
+ toQList hash = toQuery::readQuery(CONNECTION, SQLPartitionName, name, owner);
bool first = true;
ret += "(\n ";
while (!hash.empty())
@@ -2024,7 +2024,7 @@
QString ret;
if ((typ&1) == 1)
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLSystemPrivs, name);
+ toQList result = toQuery::readQuery(CONNECTION, SQLSystemPrivs, name);
while (!result.empty())
{
QString priv = QString(toShift(result)).toLower();
@@ -2045,7 +2045,7 @@
if ((typ&2) == 2)
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLRolePrivs, name);
+ toQList result = toQuery::readQuery(CONNECTION, SQLRolePrivs, name);
while (!result.empty())
{
QString priv = QString(toShift(result)).toLower();
@@ -2066,7 +2066,7 @@
if ((typ&4) == 4)
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLObjectPrivs, name);
+ toQList result = toQuery::readQuery(CONNECTION, SQLObjectPrivs, name);
while (!result.empty())
{
QString priv = QString(toShift(result)).toLower();
@@ -2264,7 +2264,7 @@
if (!ext.getPartition())
return "";
- toQList result = toQuery::readQueryNull(CONNECTION, SQLRangePartitions, name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, SQLRangePartitions, name, owner);
if (result.empty() || result.size() % 18)
throw qApp->translate("toOracleExtract", "Couldn't find partition range %1.%2").arg(owner).arg(name);
@@ -2698,7 +2698,7 @@
const QString &owner,
const QString &name) const
{
- toQList cols = toQuery::readQueryNull(CONNECTION, SQLTableColumns, name, owner);
+ toQList cols = toQuery::readQuery(CONNECTION, SQLTableColumns, name, owner);
bool first = true;
QString ret;
while (!cols.empty())
@@ -2844,21 +2844,21 @@
if (!ext.getGrants())
return ;
- toQList result = toQuery::readQueryNull(CONNECTION, SQLRolePrivs, name);
+ toQList result = toQuery::readQuery(CONNECTION, SQLRolePrivs, name);
while (!result.empty())
{
QString role = QUOTE(toShift(result));
addDescription(lst, ctx, "GRANT", "ROLE " + role, toShift(result));
}
- result = toQuery::readQueryNull(CONNECTION, SQLSystemPrivs, name);
+ result = toQuery::readQuery(CONNECTION, SQLSystemPrivs, name);
while (!result.empty())
{
QString priv = QString(toShift(result)).toLower();
addDescription(lst, ctx, "GRANT", priv, toShift(result));
}
- result = toQuery::readQueryNull(CONNECTION, SQLObjectPrivs, name);
+ result = toQuery::readQuery(CONNECTION, SQLObjectPrivs, name);
while (!result.empty())
{
QString priv = toShift(result);
@@ -2876,13 +2876,13 @@
const QString &owner,
const QString &name) const
{
- toQList storage = toQuery::readQueryNull(CONNECTION, SQLIOTInfo, name, owner);
+ toQList storage = toQuery::readQuery(CONNECTION, SQLIOTInfo, name, owner);
describeTableText(ext, lst, ctx, storage, schema, owner, name);
describeComments(ext, lst, ctx, owner, name);
if (ext.getStorage())
{
- toQList overflow = toQuery::readQueryNull(CONNECTION, segments(ext, SQLOverflowInfo), name, owner);
+ toQList overflow = toQuery::readQuery(CONNECTION, segments(ext, SQLOverflowInfo), name, owner);
if (overflow.size() == 18)
{
ctx.insert(ctx.end(), "OVERFLOW");
@@ -2930,7 +2930,7 @@
const QString &schema, const QString &owner,
const QString &name, const QString &type) const
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLMViewInfo, name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, SQLMViewInfo, name, owner);
if (result.empty())
throw qApp->translate("toOracleExtract", "Couldn't find materialised table %1.%2").
arg(QUOTE(owner)).arg(QUOTE(name));
@@ -3041,7 +3041,7 @@
const QString &name,
const QString &type) const
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLSnapshotInfo, name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, SQLSnapshotInfo, name, owner);
if (result.size() != 4)
throw qApp->translate("toOracleExtract", "Couldn't find log %1.%2").arg(owner).arg(name);
@@ -3125,7 +3125,7 @@
if (!ext.getPartition())
return ;
- toQList result = toQuery::readQueryNull(CONNECTION, SQLRangePartitions, name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, SQLRangePartitions, name, owner);
if (result.empty() || result.size() % 18)
throw qApp->translate("toOracleExtract", "Couldn't find partition range %1.%2").arg(owner).arg(name);
@@ -3168,7 +3168,7 @@
const QString &owner,
const QString &name) const
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLPartitionedIOTInfo,
+ toQList result = toQuery::readQuery(CONNECTION, SQLPartitionedIOTInfo,
QString::number(ext.getBlockSize()), name, owner);
describeTableText(ext, lst, ctx, result, schema, owner, name);
if (ext.getPartition())
@@ -3186,7 +3186,7 @@
describeComments(ext, lst, ctx, owner, name);
if (ext.getStorage())
{
- toQList overflow = toQuery::readQueryNull(CONNECTION, segments(ext, SQLOverflowInfo), name, owner);
+ toQList overflow = toQuery::readQuery(CONNECTION, segments(ext, SQLOverflowInfo), name, owner);
if (overflow.size() == 18)
{
ctx.insert(ctx.end(), "OVERFLOW");
@@ -3205,7 +3205,7 @@
if (!ext.getPartition())
return ;
- toQList result = toQuery::readQueryNull(CONNECTION, SQLIndexPartition,
+ toQList result = toQuery::readQuery(CONNECTION, SQLIndexPartition,
QString::number(ext.getBlockSize()), owner, name);
QString partitionType = toShift(result);
QString subPartitionType = toShift(result);
@@ -3244,7 +3244,7 @@
const QString &owner,
const QString &name) const
{
- toQList storage = toQuery::readQueryNull(CONNECTION, SQLPartitionTableInfo,
+ toQList storage = toQuery::readQuery(CONNECTION, SQLPartitionTableInfo,
QString::number(ext.getBlockSize()), name, owner);
QString organization;
@@ -3261,7 +3261,7 @@
if (ext.getPartition())
{
- toQList type = toQuery::readQueryNull(CONNECTION, SQLPartitionType, name, owner);
+ toQList type = toQuery::readQuery(CONNECTION, SQLPartitionType, name, owner);
QString partitionType (toShift(type));
QString partitionCount (toShift(type));
QString subPartitionType (toShift(type));
@@ -3283,7 +3283,7 @@
addDescription(lst, ctx, subprtstr);
}
- toQList segment = toQuery::readQueryNull(CONNECTION, SQLPartitionSegment, name, owner);
+ toQList segment = toQuery::readQuery(CONNECTION, SQLPartitionSegment, name, owner);
while (!segment.empty())
{
@@ -3304,7 +3304,7 @@
if (subPartitionType == "HASH")
{
- toQList subs = toQuery::readQueryNull(CONNECTION, SQLSubPartitionName,
+ toQList subs = toQuery::readQuery(CONNECTION, SQLSubPartitionName,
name, partition, owner);
while (!subs.empty())
{
@@ -3319,7 +3319,7 @@
}
else
{
- toQList hash = toQuery::readQueryNull(CONNECTION, SQLPartitionName,
+ toQList hash = toQuery::readQuery(CONNECTION, SQLPartitionName,
name, owner);
while (!hash.empty())
{
@@ -3359,7 +3359,7 @@
const QString &owner,
const QString &name) const
{
- toQList cols = toQuery::readQueryNull(CONNECTION, SQLTableColumns, name, owner);
+ toQList cols = toQuery::readQuery(CONNECTION, SQLTableColumns, name, owner);
int num = 1;
while (!cols.empty())
{
@@ -3666,7 +3666,7 @@
QString sql = toSQL::string(SQLExchangeIndex, CONNECTION).
arg(type).arg(blocks);
- toQList result = toQuery::readQueryNull(CONNECTION, sql, segment, partition, owner);
+ toQList result = toQuery::readQuery(CONNECTION, sql, segment, partition, owner);
QString degree = toShift(result);
QString instances = toShift(result);
QString table = toShift(result);
@@ -3769,7 +3769,7 @@
QString blocks = inf.readValue();
QString sql = toSQL::string(SQLExchangeTable, CONNECTION).arg(type).arg(blocks);
- toQList result = toQuery::readQueryNull(CONNECTION, sql, segment, partition, owner);
+ toQList result = toQuery::readQuery(CONNECTION, sql, segment, partition, owner);
QString ret = createTableText(ext, result, schema, owner, segment);
ret += ";\n\n";
return ret;
@@ -3987,7 +3987,7 @@
if (!ext.getIndexes())
return "";
- toQList res = toQuery::readQueryNull(CONNECTION, SQLIndexInfo, name, owner);
+ toQList res = toQuery::readQuery(CONNECTION, SQLIndexInfo, name, owner);
if (res.size() != 10)
throw qApp->translate("toOracleExtract", "Couldn't find index %1.%2").arg(owner).arg(name);
@@ -4002,7 +4002,7 @@
QString domName = toShift(res);
QString domParam = toShift(res);
- toQList storage = toQuery::readQueryNull(CONNECTION, segments(ext, SQLIndexSegment), name, owner);
+ toQList storage = toQuery::readQuery(CONNECTION, segments(ext, SQLIndexSegment), name, owner);
QString degree = toShift(storage);
QString instances = toShift(storage);
QString compressed = toShift(storage);
@@ -4138,7 +4138,7 @@
const QString &,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLProfileInfo,
name);
if (info.empty())
@@ -4186,7 +4186,7 @@
const QString &,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLRoleInfo,
name);
if (info.empty())
@@ -4228,7 +4228,7 @@
const QString &,
const QString &name) const
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLRollbackSegment, name);
+ toQList result = toQuery::readQuery(CONNECTION, SQLRollbackSegment, name);
QString isPublic = toShift(result);
QString tablespaceName = toShift(result);
QString initialExtent = toShift(result);
@@ -4298,7 +4298,7 @@
const QString &owner,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLSequenceInfo,
name, owner);
if (info.empty())
@@ -4351,7 +4351,7 @@
const QString &owner,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLSynonymInfo,
name, owner);
if (info.empty())
@@ -4603,7 +4603,7 @@
else if (partitioned == "YES")
return createPartitionedTable(ext, schema, owner, name);
- toQList result = toQuery::readQueryNull(CONNECTION, segments(ext, SQLTableInfo), name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, segments(ext, SQLTableInfo), name, owner);
QString ret = createTableText(ext, result, schema, owner, name);
ret += ";\n\n";
ret += createComments(ext, schema, owner, name);
@@ -4720,8 +4720,8 @@
inf.readValue();
QString iotType(inf.readValue());
- toQList constraints = toQuery::readQueryNull(CONNECTION, SQLTableConstraints, name, owner);
- toQList indexes = toQuery::readQueryNull(CONNECTION, SQLIndexNames, name, owner);
+ toQList constraints = toQuery::readQuery(CONNECTION, SQLTableConstraints, name, owner);
+ toQList indexes = toQuery::readQuery(CONNECTION, SQLIndexNames, name, owner);
while (!indexes.empty())
{
@@ -4759,7 +4759,7 @@
ret += createConstraint(ext, schema, owner, name);
}
- toQList triggers = toQuery::readQueryNull(CONNECTION, SQLTableTriggers, name, owner);
+ toQList triggers = toQuery::readQuery(CONNECTION, SQLTableTriggers, name, owner);
while (!triggers.empty())
ret += createTrigger(ext, schema, owner, toShift(triggers));
return ret;
@@ -4815,7 +4815,7 @@
first = false;
else
line += ",";
- QString val = query.readValueNull();
+ QString val = query.readValue();
if (dates[i])
{
if (val.isNull())
@@ -4860,7 +4860,7 @@
const QString &name) const
{
QString ret;
- toQList constraints = toQuery::readQueryNull(CONNECTION, SQLTableReferences, name, owner);
+ toQList constraints = toQuery::readQuery(CONNECTION, SQLTableReferences, name, owner);
while (!constraints.empty())
ret += createConstraint(ext, schema, owner, toShift(constraints));
return ret;
@@ -5015,7 +5015,7 @@
const QString &,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLTablespaceInfo,
QString::number(ext.getBlockSize()),
name);
@@ -5050,7 +5050,7 @@
}
ret += sql;
- toQList files = toQuery::readQueryNull(CONNECTION,
+ toQList files = toQuery::readQuery(CONNECTION,
SQLDatafileInfo,
QString::number(ext.getBlockSize()),
name);
@@ -5169,7 +5169,7 @@
{
if (!ext.getCode())
return "";
- toQList result = toQuery::readQueryNull(CONNECTION, SQLTriggerInfo, name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, SQLTriggerInfo, name, owner);
if (result.size() != 10)
throw qApp->translate("toOracleExtract", "Couldn't find trigger %1.%2").arg(owner).arg(name);
QString triggerType = toShift(result);
@@ -5302,7 +5302,7 @@
const QString &,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLUserInfo,
name);
@@ -5334,7 +5334,7 @@
if (ext.getStorage())
{
- toQList quota = toQuery::readQueryNull(CONNECTION, SQLUserQuotas, name);
+ toQList quota = toQuery::readQuery(CONNECTION, SQLUserQuotas, name);
while (!quota.empty())
{
QString siz = toShift(quota);
@@ -5373,7 +5373,7 @@
{
if (!ext.getCode())
return "";
- toQList source = toQuery::readQueryNull(CONNECTION,
+ toQList source = toQuery::readQuery(CONNECTION,
SQLViewSource,
name, owner);
if (source.empty())
@@ -5389,7 +5389,7 @@
ret += "\n";
}
ret += sql;
- toQList cols = toQuery::readQueryNull(CONNECTION,
+ toQList cols = toQuery::readQuery(CONNECTION,
SQLViewColumns,
name, owner);
ret += "(";
@@ -5533,7 +5533,7 @@
QString blocks = inf.readValue();
QString sql = toSQL::string(SQLExchangeIndex, CONNECTION).arg(type).arg(blocks);
- toQList result = toQuery::readQueryNull(CONNECTION, sql, segment, partition, owner);
+ toQList result = toQuery::readQuery(CONNECTION, sql, segment, partition, owner);
QString degree = toShift(result);
QString instances = toShift(result);
QString table = toShift(result);
@@ -5580,7 +5580,7 @@
QString blocks = inf.readValue();
QString sql = toSQL::string(SQLExchangeTable, CONNECTION).arg(type).arg(blocks);
- toQList result = toQuery::readQueryNull(CONNECTION, sql, segment, partition, owner);
+ toQList result = toQuery::readQuery(CONNECTION, sql, segment, partition, owner);
std::list<QString> ctx;
ctx.insert(ctx.end(), schema);
ctx.insert(ctx.end(), "EXCHANGE TABLE");
@@ -5607,7 +5607,7 @@
if (!ext.getIndexes())
return ;
- toQList res = toQuery::readQueryNull(CONNECTION, SQLIndexInfo, name, owner);
+ toQList res = toQuery::readQuery(CONNECTION, SQLIndexInfo, name, owner);
if (res.size() != 10)
throw qApp->translate("toOracleExtract", "Couldn't find index %1.%2").arg(owner).arg(name);
@@ -5622,7 +5622,7 @@
QString domName = toShift(res);
QString domParam = toShift(res);
- toQList storage = toQuery::readQueryNull(CONNECTION, segments(ext, SQLIndexSegment), name, owner);
+ toQList storage = toQuery::readQuery(CONNECTION, segments(ext, SQLIndexSegment), name, owner);
QString degree = toShift(storage);
QString instances = toShift(storage);
QString compressed = toShift(storage);
@@ -5716,7 +5716,7 @@
const QString &,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLProfileInfo,
name);
if (info.empty())
@@ -5742,7 +5742,7 @@
const QString &,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLRoleInfo,
name);
if (info.empty())
@@ -5763,7 +5763,7 @@
const QString &,
const QString &name) const
{
- toQList result = toQuery::readQueryNull(CONNECTION, SQLRollbackSegment, name);
+ toQList result = toQuery::readQuery(CONNECTION, SQLRollbackSegment, name);
QString isPublic = toShift(result);
QString tablespaceName = toShift(result);
QString initialExtent = toShift(result);
@@ -5796,7 +5796,7 @@
const QString &owner,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLSequenceInfo,
name, owner);
if (info.empty())
@@ -5837,7 +5837,7 @@
const QString &owner,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLSynonymInfo,
name, owner);
if (info.empty())
@@ -5891,7 +5891,7 @@
return ;
}
- toQList result = toQuery::readQueryNull(CONNECTION, segments(ext, SQLTableInfo), name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, segments(ext, SQLTableInfo), name, owner);
describeTableText(ext, lst, ctx, result, schema, owner, name);
describeComments(ext, lst, ctx, owner, name);
}
@@ -5904,7 +5904,7 @@
{
describeTable(ext, lst, schema, owner, name);
- toQList indexes = toQuery::readQueryNull(CONNECTION, SQLIndexNames, name, owner);
+ toQList indexes = toQuery::readQuery(CONNECTION, SQLIndexNames, name, owner);
while (!indexes.empty())
{
QString indOwner(toShift(indexes));
@@ -5918,17 +5918,17 @@
inf.readValue();
QString iotType(inf.readValue());
- toQList constraints = toQuery::readQueryNull(CONNECTION, SQLTableConstraints, name, owner);
+ toQList constraints = toQuery::readQuery(CONNECTION, SQLTableConstraints, name, owner);
while (!constraints.empty())
{
- if (toShift(constraints).toUtf8() != "P" || iotType != "IOT")
+ if ( (QString)toShift(constraints) != "P" || iotType != "IOT")
describeConstraint(ext, lst, schema, owner, toShift(constraints));
else
toShift(constraints);
toShift(constraints);
}
- toQList triggers = toQuery::readQueryNull(CONNECTION, SQLTableTriggers, name, owner);
+ toQList triggers = toQuery::readQuery(CONNECTION, SQLTableTriggers, name, owner);
while (!triggers.empty())
describeTrigger(ext, lst, schema, owner, toShift(triggers));
}
@@ -5939,7 +5939,7 @@
const QString &owner,
const QString &name) const
{
- toQList constraints = toQuery::readQueryNull(CONNECTION, SQLTableReferences, name, owner);
+ toQList constraints = toQuery::readQuery(CONNECTION, SQLTableReferences, name, owner);
while (!constraints.empty())
describeConstraint(ext, lst, schema, owner, toShift(constraints));
}
@@ -5950,7 +5950,7 @@
const QString &,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLTablespaceInfo,
QString::number(ext.getBlockSize()),
name);
@@ -5980,7 +5980,7 @@
addDescription(lst, ctx);
- toQList files = toQuery::readQueryNull(CONNECTION,
+ toQList files = toQuery::readQuery(CONNECTION,
SQLDatafileInfo,
QString::number(ext.getBlockSize()),
name);
@@ -6051,7 +6051,7 @@
if (!ext.getCode())
return ;
- toQList result = toQuery::readQueryNull(CONNECTION, SQLTriggerInfo, name, owner);
+ toQList result = toQuery::readQuery(CONNECTION, SQLTriggerInfo, name, owner);
if (result.size() != 10)
throw qApp->translate("toOracleExtract", "Couldn't find trigger %1.%2").arg(owner).arg(name);
QString triggerType = toShift(result);
@@ -6148,7 +6148,7 @@
const QString &,
const QString &name) const
{
- toQList info = toQuery::readQueryNull(CONNECTION,
+ toQList info = toQuery::readQuery(CONNECTION,
SQLUserInfo,
name);
@@ -6177,7 +6177,7 @@
if (ext.getStorage())
{
- toQList quota = toQuery::readQueryNull(CONNECTION, SQLUserQuotas, name);
+ toQList quota = toQuery::readQuery(CONNECTION, SQLUserQuotas, name);
while (!quota.empty())
{
QString siz = toShift(quota);
@@ -6198,7 +6198,7 @@
{
if (!ext.getCode())
return ;
- toQList source = toQuery::readQueryNull(CONNECTION,
+ toQList source = toQuery::readQuery(CONNECTION,
SQLViewSource,
name, owner);
if (source.empty())
@@ -6235,7 +6235,7 @@
const QString &,
const QString &name) const
{
- toQList tableName = toQuery::readQueryNull(CONNECTION,
+ toQList tableName = toQuery::readQuery(CONNECTION,
SQLConstraintTable,
owner, name);
if (tableName.empty())
@@ -7546,14 +7546,14 @@
try
{
- toQList ret = toQuery::readQueryNull(CONNECTION, SQLSetSizing);
+ toQList ret = toQuery::readQuery(CONNECTION, SQLSetSizing);
ext.setBlockSize(toShift(ret).toInt());
}
catch (...)
{
- toQList ret = toQuery::readQueryNull(CONNECTION, SQLSetSizingFallback);
+ toQList ret = toQuery::readQuery(CONNECTION, SQLSetSizingFallback);
if (ret.empty())
- ret = toQuery::readQueryNull(CONNECTION, SQLSetSizingFallback2);
+ ret = toQuery::readQuery(CONNECTION, SQLSetSizingFallback2);
ext.setBlockSize(toShift(ret).toInt());
}
}
Modified: trunk/tora/src/tooutput.cpp
===================================================================
--- trunk/tora/src/tooutput.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/tooutput.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -383,8 +383,8 @@
any = false;
while (!query.eof())
{
- QString line = query.readValueNull();
- int status = query.readValueNull().toInt();
+ QString line = query.readValue();
+ int status = query.readValue().toInt();
if (status == 0)
{
any = true;
Modified: trunk/tora/src/toprofiler.cpp
===================================================================
--- trunk/tora/src/toprofiler.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/toprofiler.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -596,10 +596,10 @@
int id = 1;
while (!query.eof())
{
- QString runid = query.readValueNull();
- QString owner = query.readValueNull();
- QString comment = query.readValueNull();
- double total = query.readValueNull().toDouble() / 1E9;
+ QString runid = query.readValue();
+ QString owner = query.readValue();
+ QString comment = query.readValue();
+ double total = query.readValue().toDouble() / 1E9;
if (!owner.isEmpty())
owner = QString::fromLatin1("(") + owner + QString::fromLatin1(")");
QString timstr = QString::fromLatin1(" [") + FormatTime(total) + QString::fromLatin1("]");
Modified: trunk/tora/src/toqsqlconnection.cpp
===================================================================
--- trunk/tora/src/toqsqlconnection.cpp 2010-11-17 16:33:01 UTC (rev 3811)
+++ trunk/tora/src/toqsqlconnection.cpp 2010-11-18 11:52:13 UTC (rev 3812)
@@ -1540,7 +1540,7 @@
toQuery databases(connection(), SQLListDatabases);
while (!databases.eof())
{
- QString db = databases.readValueNull();
+ QString db = databases.readValue();
cur.Owner = db;
cur.Type = "DATABASE";
cur.Name = QString::null;
@@ -1550,12 +1550,12 @@
toQuery tables(connection(), SQLListObjectsDatabase, db);
while (!tables.eof())
{
- cur.Name = tables.readValueNull();
+ cur.Name = tables.readValue();
cur.Owner = db;
cur.Type = "TABLE";
for (int i = 2;i < tables.columns();i++) // I just wan't the last column except for the first one
- tables.readValueNull();
- cur.Comment = tables.readValueNull();
+ tables.readValue();
+ cur.Comment = tables.readValue();
ret.insert(ret.end(), cur);
}
}
@@ -1568,13 +1568,13 @@
toQuery tables(connection(), SQLListObjects);
while (!tables.eof())
{
- cur.Name = tables.readValueNull();
+ cur.Name = tables.readValue();
if (tables.columns() > 1)
- cur.Owner = tables.readValueNull();
+ cur.Owner = tables.readValue();
else
cur.Owner = connection().database();
...
[truncated message content] |
|
From: <tom...@us...> - 2010-11-27 13:06:59
|
Revision: 3826
http://tora.svn.sourceforge.net/tora/?rev=3826&view=rev
Author: tomasstraupis
Date: 2010-11-27 13:06:51 +0000 (Sat, 27 Nov 2010)
Log Message:
-----------
Add a posibility to change the default encoding used when reading/writing files.
Modified Paths:
--------------
trunk/tora/doc/help/Index_002dlist.html
trunk/tora/doc/help/Makefile.am
trunk/tora/doc/help/alert.html
trunk/tora/doc/help/analyze.html
trunk/tora/doc/help/api.html
trunk/tora/doc/help/browser.html
trunk/tora/doc/help/common.html
trunk/tora/doc/help/current.html
trunk/tora/doc/help/debugger.html
trunk/tora/doc/help/explainplan.html
trunk/tora/doc/help/extendingtora.html
trunk/tora/doc/help/gettingbindparameters.html
trunk/tora/doc/help/index.html
trunk/tora/doc/help/invalid.html
trunk/tora/doc/help/memoeditor.html
trunk/tora/doc/help/objectdescription.html
trunk/tora/doc/help/output.html
trunk/tora/doc/help/plsqleditor.html
trunk/tora/doc/help/preferences.html
trunk/tora/doc/help/rollback.html
trunk/tora/doc/help/script.html
trunk/tora/doc/help/security.html
trunk/tora/doc/help/session.html
trunk/tora/doc/help/sgastatement.html
trunk/tora/doc/help/sqledit.html
trunk/tora/doc/help/storage.html
trunk/tora/doc/help/template.html
trunk/tora/doc/help/tools.html
trunk/tora/doc/help/tora.texi
trunk/tora/doc/help/trace.html
trunk/tora/doc/help/tuning.html
trunk/tora/doc/help/unittest.html
trunk/tora/doc/help/worksheet.html
trunk/tora/doc/help/workspace.html
trunk/tora/doc/help/workspace.texi
trunk/tora/src/toconf.h
trunk/tora/src/toconfiguration.cpp
trunk/tora/src/toconfiguration.h
trunk/tora/src/tora.qrc
trunk/tora/src/utils.cpp
Added Paths:
-----------
trunk/tora/src/help/advancedpreferences.html
Modified: trunk/tora/doc/help/Index_002dlist.html
===================================================================
--- trunk/tora/doc/help/Index_002dlist.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/Index_002dlist.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,40 +36,41 @@
<ul class="index-cp" compact>
<li><a href="additionalhelp.html#index-Additional-Help-Settings-14">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li>
-<li><a href="alert.html#index-Alert-Tool-33">Alert Tool</a>: <a href="alert.html#alert">alert</a></li>
-<li><a href="tools.html#index-Available-tools-18">Available tools</a>: <a href="tools.html#tools">tools</a></li>
+<li><a href="advancedpreferences.html#index-Advanced-Preferences-16">Advanced Preferences</a>: <a href="advancedpreferences.html#advancedpreferences">advancedpreferences</a></li>
+<li><a href="alert.html#index-Alert-Tool-34">Alert Tool</a>: <a href="alert.html#alert">alert</a></li>
+<li><a href="tools.html#index-Available-tools-19">Available tools</a>: <a href="tools.html#tools">tools</a></li>
<li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li>
-<li><a href="current.html#index-Current-Session-30">Current Session</a>: <a href="current.html#current">current</a></li>
+<li><a href="current.html#index-Current-Session-31">Current Session</a>: <a href="current.html#current">current</a></li>
<li><a href="database.html#index-Database-Settings-13">Database Settings</a>: <a href="database.html#database">database</a></li>
<li><a href="editor.html#index-Editor-Settings-12">Editor Settings</a>: <a href="editor.html#editor">editor</a></li>
<li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li>
-<li><a href="extendingtora.html#index-Extending-TOra-38">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li>
+<li><a href="extendingtora.html#index-Extending-TOra-39">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li>
<li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li>
<li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li>
-<li><a href="invalid.html#index-Invalid-Objects-34">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li>
+<li><a href="invalid.html#index-Invalid-Objects-35">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li>
<li><a href="lists.html#index-lists-8">lists</a>: <a href="lists.html#lists">lists</a></li>
-<li><a href="common.html#index-Other-common-elements-16">Other common elements</a>: <a href="common.html#common">common</a></li>
-<li><a href="debugger.html#index-PL_002fSQL-Debugger-22">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li>
-<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-21">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li>
-<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-23">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li>
+<li><a href="common.html#index-Other-common-elements-17">Other common elements</a>: <a href="common.html#common">common</a></li>
+<li><a href="debugger.html#index-PL_002fSQL-Debugger-23">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li>
+<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-22">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li>
+<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-24">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li>
<li><a href="preferences.html#index-Preferences-11">Preferences</a>: <a href="preferences.html#preferences">preferences</a></li>
-<li><a href="rollback.html#index-Rollback-Segments-28">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li>
-<li><a href="browser.html#index-Schema-Browser-20">Schema Browser</a>: <a href="browser.html#browser">browser</a></li>
-<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-31">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li>
+<li><a href="rollback.html#index-Rollback-Segments-29">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li>
+<li><a href="browser.html#index-Schema-Browser-21">Schema Browser</a>: <a href="browser.html#browser">browser</a></li>
+<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-32">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li>
<li><a href="searchreplace.html#index-Search-_0026-Replace-10">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li>
-<li><a href="security.html#index-Security-Manager-25">Security Manager</a>: <a href="security.html#security">security</a></li>
-<li><a href="tuning.html#index-Server-Tuning-24">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li>
-<li><a href="session.html#index-Session-Manager-27">Session Manager</a>: <a href="session.html#session">session</a></li>
-<li><a href="sgastatement.html#index-SGA-Statement-17">SGA Statement</a>: <a href="sgastatement.html#sgastatement">sgastatement</a></li>
-<li><a href="trace.html#index-SGA-Trace-29">SGA Trace</a>: <a href="trace.html#trace">trace</a></li>
-<li><a href="sqledit.html#index-SQL-Editor-37">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li>
-<li><a href="worksheet.html#index-SQL-Editor-19">SQL Editor</a>: <a href="worksheet.html#worksheet">worksheet</a></li>
-<li><a href="output.html#index-SQL-Output-35">SQL Output</a>: <a href="output.html#output">output</a></li>
-<li><a href="analyze.html#index-Statistics-manager-32">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li>
-<li><a href="storage.html#index-Storage-Manager-26">Storage Manager</a>: <a href="storage.html#storage">storage</a></li>
-<li><a href="template.html#index-Template-Help-36">Template Help</a>: <a href="template.html#template">template</a></li>
+<li><a href="security.html#index-Security-Manager-26">Security Manager</a>: <a href="security.html#security">security</a></li>
+<li><a href="tuning.html#index-Server-Tuning-25">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li>
+<li><a href="session.html#index-Session-Manager-28">Session Manager</a>: <a href="session.html#session">session</a></li>
+<li><a href="sgastatement.html#index-SGA-Statement-18">SGA Statement</a>: <a href="sgastatement.html#sgastatement">sgastatement</a></li>
+<li><a href="trace.html#index-SGA-Trace-30">SGA Trace</a>: <a href="trace.html#trace">trace</a></li>
+<li><a href="sqledit.html#index-SQL-Editor-38">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li>
+<li><a href="worksheet.html#index-SQL-Editor-20">SQL Editor</a>: <a href="worksheet.html#worksheet">worksheet</a></li>
+<li><a href="output.html#index-SQL-Output-36">SQL Output</a>: <a href="output.html#output">output</a></li>
+<li><a href="analyze.html#index-Statistics-manager-33">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li>
+<li><a href="storage.html#index-Storage-Manager-27">Storage Manager</a>: <a href="storage.html#storage">storage</a></li>
+<li><a href="template.html#index-Template-Help-37">Template Help</a>: <a href="template.html#template">template</a></li>
<li><a href="toolsetting.html#index-Tool-Settings-15">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li>
-<li><a href="api.html#index-TOra-Tool-Tutorial-39">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li>
+<li><a href="api.html#index-TOra-Tool-Tutorial-40">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li>
<li><a href="charts.html#index-Using-charts-9">Using charts</a>: <a href="charts.html#charts">charts</a></li>
<li><a href="editors.html#index-Using-editors-7">Using editors</a>: <a href="editors.html#editors">editors</a></li>
<li><a href="help.html#index-Using-the-help-browser-1">Using the help browser</a>: <a href="help.html#help">help</a></li>
Modified: trunk/tora/doc/help/Makefile.am
===================================================================
--- trunk/tora/doc/help/Makefile.am 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/Makefile.am 2010-11-27 13:06:51 UTC (rev 3826)
@@ -25,6 +25,7 @@
newconnection.texi \
output.texi \
preferences.texi \
+ advancedpreferences.texi \
rollback.texi \
script.texi \
searchreplace.texi \
Modified: trunk/tora/doc/help/alert.html
===================================================================
--- trunk/tora/doc/help/alert.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/alert.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.15 Alert Tool</h3>
-<p><a name="index-Alert-Tool-33"></a>This tool is useful for debugging database packages that send or depend on receiving dbms alerts.
+<p><a name="index-Alert-Tool-34"></a>This tool is useful for debugging database packages that send or depend on receiving dbms alerts.
<div class="block-image"><img src="images/alert.png" alt="images/alert.png"></div>
Modified: trunk/tora/doc/help/analyze.html
===================================================================
--- trunk/tora/doc/help/analyze.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/analyze.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.14 Statistics manager</h3>
-<p><a name="index-Statistics-manager-32"></a>
+<p><a name="index-Statistics-manager-33"></a>
This tool is useful for collecting statistics and analysing tables in parallel. You can also use it to browse collected statistics.
<div class="block-image"><img src="images/analyze.png" alt="images/analyze.png"></div>
Modified: trunk/tora/doc/help/api.html
===================================================================
--- trunk/tora/doc/help/api.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/api.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -34,7 +34,7 @@
<h3 class="section">5.1 TOra Tool Tutorial</h3>
-<p><a name="index-TOra-Tool-Tutorial-39"></a>
+<p><a name="index-TOra-Tool-Tutorial-40"></a>
This tutorial will create a simple tool that can execute an SQL statement and display it's content in a list. This tutorial assumes you have knowledge of C++ and Qt programming.
<p>First of all we create an include file which defines the tool widget. This is the window that will be displayed when the a tool window is created. How that happens comes later.
Modified: trunk/tora/doc/help/browser.html
===================================================================
--- trunk/tora/doc/help/browser.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/browser.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.2 Schema Browser</h3>
-<p><a name="index-Schema-Browser-20"></a>
+<p><a name="index-Schema-Browser-21"></a>
This tool provides you a simple browser for exploring database schema objects. Initially it can be said that the
browser also provides a browser like functionality for the template help (see <a href="template.html#template">Template Help</a>) which
is covered separately. This browser will provide you with more information and you will also in future versions
Modified: trunk/tora/doc/help/common.html
===================================================================
--- trunk/tora/doc/help/common.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/common.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -6,7 +6,7 @@
<meta name="generator" content="makeinfo 4.13">
<link title="Top" rel="start" href="index.html#Top">
<link rel="up" href="workspace.html#workspace" title="workspace">
-<link rel="prev" href="preferences.html#preferences" title="preferences">
+<link rel="prev" href="advancedpreferences.html#advancedpreferences" title="advancedpreferences">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
This manual is for TOra, version 2.1.4+.-->
@@ -27,14 +27,14 @@
<div class="node">
<a name="common"></a>
<p>
-Previous: <a rel="previous" accesskey="p" href="preferences.html#preferences">preferences</a>,
+Previous: <a rel="previous" accesskey="p" href="advancedpreferences.html#advancedpreferences">advancedpreferences</a>,
Up: <a rel="up" accesskey="u" href="workspace.html#workspace">workspace</a>
<hr>
</div>
-<h3 class="section">3.9 Other common elements</h3>
+<h3 class="section">3.10 Other common elements</h3>
-<p><a name="index-Other-common-elements-16"></a>
+<p><a name="index-Other-common-elements-17"></a>
These describe other elements that are used in several parts of the user interface.
<ul class="menu">
Modified: trunk/tora/doc/help/current.html
===================================================================
--- trunk/tora/doc/help/current.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/current.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.12 Current Session</h3>
-<p><a name="index-Current-Session-30"></a>
+<p><a name="index-Current-Session-31"></a>
This tool provides information about the current session.
<div class="block-image"><img src="images/current.png" alt="images/current.png"></div>
Modified: trunk/tora/doc/help/debugger.html
===================================================================
--- trunk/tora/doc/help/debugger.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/debugger.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.4 PL/SQL Debugger</h3>
-<p><a name="index-PL_002fSQL-Debugger-22"></a>
+<p><a name="index-PL_002fSQL-Debugger-23"></a>
This tool provides you with an advanced editor and debugger for developing PL/SQL objects.
<div class="block-image"><img src="images/debugger.png" alt="images/debugger.png"></div>
Modified: trunk/tora/doc/help/explainplan.html
===================================================================
--- trunk/tora/doc/help/explainplan.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/explainplan.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -34,7 +34,7 @@
<hr>
</div>
-<h4 class="subsection">3.9.2 Explain plan</h4>
+<h4 class="subsection">3.10.2 Explain plan</h4>
<p>This element can be either part of an SGA statement or by itself in some cases (See above for a screenshot). For more information about execution paths check the Oracle manual Designing and Tuning for Performance, chapter 5 in the 8i release.
Modified: trunk/tora/doc/help/extendingtora.html
===================================================================
--- trunk/tora/doc/help/extendingtora.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/extendingtora.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -35,7 +35,7 @@
<h2 class="chapter">5 Extending TOra</h2>
-<p><a name="index-Extending-TOra-38"></a>
+<p><a name="index-Extending-TOra-39"></a>
<ul class="menu">
<li><a accesskey="1" href="api.html#api">TOra Tool Tutorial</a>
Modified: trunk/tora/doc/help/gettingbindparameters.html
===================================================================
--- trunk/tora/doc/help/gettingbindparameters.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/gettingbindparameters.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -34,7 +34,7 @@
<hr>
</div>
-<h4 class="subsection">3.9.3 Getting bind parameters</h4>
+<h4 class="subsection">3.10.3 Getting bind parameters</h4>
<p>This dialog is displayed when input parameters are required to run the SQL. For instance the example dialog is the dialog displayed when running the following SQL in the worksheet.
Modified: trunk/tora/doc/help/index.html
===================================================================
--- trunk/tora/doc/help/index.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/index.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -46,13 +46,14 @@
<li><a href="additionalhelp.html#additionalhelp">3.8.4 Additional Help Settings</a>
<li><a href="toolsetting.html#toolsetting">3.8.5 Tool Settings</a>
</li></ul>
-<li><a href="common.html#common">3.9 Other common elements</a>
+<li><a href="advancedpreferences.html#advancedpreferences">3.9 Advanced Preferences</a>
+<li><a href="common.html#common">3.10 Other common elements</a>
<ul>
-<li><a href="sgastatement.html#sgastatement">3.9.1 SGA Statement</a>
-<li><a href="explainplan.html#explainplan">3.9.2 Explain plan</a>
-<li><a href="gettingbindparameters.html#gettingbindparameters">3.9.3 Getting bind parameters</a>
-<li><a href="objectdescription.html#objectdescription">3.9.4 Object description</a>
-<li><a href="memoeditor.html#memoeditor">3.9.5 Memo editor</a>
+<li><a href="sgastatement.html#sgastatement">3.10.1 SGA Statement</a>
+<li><a href="explainplan.html#explainplan">3.10.2 Explain plan</a>
+<li><a href="gettingbindparameters.html#gettingbindparameters">3.10.3 Getting bind parameters</a>
+<li><a href="objectdescription.html#objectdescription">3.10.4 Object description</a>
+<li><a href="memoeditor.html#memoeditor">3.10.5 Memo editor</a>
</li></ul>
</li></ul>
<li><a name="toc_tools" href="tools.html#tools">4 Available tools</a>
Modified: trunk/tora/doc/help/invalid.html
===================================================================
--- trunk/tora/doc/help/invalid.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/invalid.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.16 Invalid Objects</h3>
-<p><a name="index-Invalid-Objects-34"></a>
+<p><a name="index-Invalid-Objects-35"></a>
This tool is useful to recompile invalid objects in the database.
<div class="block-image"><img src="images/invalid.png" alt="images/invalid.png"></div>
Modified: trunk/tora/doc/help/memoeditor.html
===================================================================
--- trunk/tora/doc/help/memoeditor.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/memoeditor.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -32,7 +32,7 @@
<hr>
</div>
-<h4 class="subsection">3.9.5 Memo editor</h4>
+<h4 class="subsection">3.10.5 Memo editor</h4>
<div class="block-image"><img src="images/memo.png" alt="images/memo.png"></div>
Modified: trunk/tora/doc/help/objectdescription.html
===================================================================
--- trunk/tora/doc/help/objectdescription.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/objectdescription.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -34,7 +34,7 @@
<hr>
</div>
-<h4 class="subsection">3.9.4 Object description</h4>
+<h4 class="subsection">3.10.4 Object description</h4>
<div class="block-image"><img src="images/describe.png" alt="images/describe.png"></div>
Modified: trunk/tora/doc/help/output.html
===================================================================
--- trunk/tora/doc/help/output.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/output.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.17 SQL Output</h3>
-<p><a name="index-SQL-Output-35"></a>
+<p><a name="index-SQL-Output-36"></a>
This tool displays the output from the DBMS_OUTPUT package (For more information see the Oracle PL/SQL Supplied Packages manual).
<div class="block-image"><img src="images/output.png" alt="images/output.png"></div>
Modified: trunk/tora/doc/help/plsqleditor.html
===================================================================
--- trunk/tora/doc/help/plsqleditor.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/plsqleditor.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.3 PL/SQL Editor</h3>
-<p><a name="index-PL_002fSQL-Editor-21"></a>
+<p><a name="index-PL_002fSQL-Editor-22"></a>
This tool provides you with an advanced editor for developing PL/SQL objects.
<h4 class="subheading">Elements of the editor window</h4>
Modified: trunk/tora/doc/help/preferences.html
===================================================================
--- trunk/tora/doc/help/preferences.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/preferences.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -7,7 +7,7 @@
<link title="Top" rel="start" href="index.html#Top">
<link rel="up" href="workspace.html#workspace" title="workspace">
<link rel="prev" href="searchreplace.html#searchreplace" title="searchreplace">
-<link rel="next" href="common.html#common" title="common">
+<link rel="next" href="advancedpreferences.html#advancedpreferences" title="advancedpreferences">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
<!--
This manual is for TOra, version 2.1.4+.-->
@@ -28,7 +28,7 @@
<div class="node">
<a name="preferences"></a>
<p>
-Next: <a rel="next" accesskey="n" href="common.html#common">common</a>,
+Next: <a rel="next" accesskey="n" href="advancedpreferences.html#advancedpreferences">advancedpreferences</a>,
Previous: <a rel="previous" accesskey="p" href="searchreplace.html#searchreplace">searchreplace</a>,
Up: <a rel="up" accesskey="u" href="workspace.html#workspace">workspace</a>
<hr>
Modified: trunk/tora/doc/help/rollback.html
===================================================================
--- trunk/tora/doc/help/rollback.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/rollback.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.10 Rollback Segments</h3>
-<p><a name="index-Rollback-Segments-28"></a>
+<p><a name="index-Rollback-Segments-29"></a>
This tool is used to manage rollback segments in the database.
<div class="block-image"><img src="images/rollback.png" alt="images/rollback.png"></div>
Modified: trunk/tora/doc/help/script.html
===================================================================
--- trunk/tora/doc/help/script.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/script.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.13 Schema extraction, compare and search</h3>
-<p><a name="index-Schema-extraction_002c-compare-and-search-31"></a>
+<p><a name="index-Schema-extraction_002c-compare-and-search-32"></a>
This tool is used to either extract a script to recreate database objects, compare database objects or search database objects.
<div class="block-image"><img src="images/script.png" alt="images/script.png"></div>
Modified: trunk/tora/doc/help/security.html
===================================================================
--- trunk/tora/doc/help/security.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/security.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.7 Security Manager</h3>
-<p><a name="index-Security-Manager-25"></a>
+<p><a name="index-Security-Manager-26"></a>
This tool provides an easy interface to manipulate users, roles and their privileges.
<div class="block-image"><img src="images/security.png" alt="images/security.png"></div>
Modified: trunk/tora/doc/help/session.html
===================================================================
--- trunk/tora/doc/help/session.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/session.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.9 Session Manager</h3>
-<p><a name="index-Session-Manager-27"></a>
+<p><a name="index-Session-Manager-28"></a>
This tool is used to manage the connections made to the database.
<div class="block-image"><img src="images/session.png" alt="images/session.png"></div>
Modified: trunk/tora/doc/help/sgastatement.html
===================================================================
--- trunk/tora/doc/help/sgastatement.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/sgastatement.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -32,9 +32,9 @@
<hr>
</div>
-<h4 class="subsection">3.9.1 SGA Statement</h4>
+<h4 class="subsection">3.10.1 SGA Statement</h4>
-<p><a name="index-SGA-Statement-17"></a>
+<p><a name="index-SGA-Statement-18"></a>
This element is used to describe an element in the SGA.
<div class="block-image"><img src="images/sgastatement.png" alt="images/sgastatement.png"></div>
Modified: trunk/tora/doc/help/sqledit.html
===================================================================
--- trunk/tora/doc/help/sqledit.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/sqledit.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -34,7 +34,7 @@
<h3 class="section">4.19 SQL Editor</h3>
-<p><a name="index-SQL-Editor-37"></a>
+<p><a name="index-SQL-Editor-38"></a>
When TOra needs to run an SQL statement it will not actually use the SQL needed directly. It will fetch an SQL statement by addressing it with a string. The string is built up by a module name, followed by a colon and a unique name for the SQL (Example: toBrowser:ListIndex which will contain the SQL statement for getting all the indexes for a schema).
<p>For each SQL name there may be a number of actual SQL strings that are available, each are associated with a version number. When TOra requests an SQL statement by a name it will receive the string with the statement with the highest version number lower than the version of Oracle for the current connection that will be used to run it. Each SQL name also has a description associated with it so you can understand what the SQL is supposed to do.
Modified: trunk/tora/doc/help/storage.html
===================================================================
--- trunk/tora/doc/help/storage.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/storage.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.8 Storage Manager</h3>
-<p><a name="index-Storage-Manager-26"></a>
+<p><a name="index-Storage-Manager-27"></a>
This tool provides an easy interface to administrate tablespaces and datafiles.
<div class="block-image"><img src="images/storage.png" alt="images/storage.png"></div>
Modified: trunk/tora/doc/help/template.html
===================================================================
--- trunk/tora/doc/help/template.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/template.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.18 Template Help</h3>
-<p><a name="index-Template-Help-36"></a>
+<p><a name="index-Template-Help-37"></a>
This tool provides help for writing PL/SQL and SQL queries by allowing a non obtrusive database browser and help lookup.
<p>The template help is implemented as a docked window.
Modified: trunk/tora/doc/help/tools.html
===================================================================
--- trunk/tora/doc/help/tools.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/tools.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -35,7 +35,7 @@
<h2 class="chapter">4 Available tools</h2>
-<p><a name="index-Available-tools-18"></a>
+<p><a name="index-Available-tools-19"></a>
These are the available tools in a standard TOra installation. Individual installations may vary.
<ul class="menu">
Modified: trunk/tora/doc/help/tora.texi
===================================================================
--- trunk/tora/doc/help/tora.texi 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/tora.texi 2010-11-27 13:06:51 UTC (rev 3826)
@@ -53,6 +53,7 @@
@include database.texi
@include additionalhelp.texi
@include toolsetting.texi
+@include advancedpreferences.texi
@include common.texi
@include sgastatement.texi
@include explainplan.texi
Modified: trunk/tora/doc/help/trace.html
===================================================================
--- trunk/tora/doc/help/trace.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/trace.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.11 SGA Trace</h3>
-<p><a name="index-SGA-Trace-29"></a>
+<p><a name="index-SGA-Trace-30"></a>
This tool is used investigate the statements available in the SGA.
<div class="block-image"><img src="images/sgatrace.png" alt="images/sgatrace.png"></div>
Modified: trunk/tora/doc/help/tuning.html
===================================================================
--- trunk/tora/doc/help/tuning.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/tuning.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.6 Server Tuning</h3>
-<p><a name="index-Server-Tuning-24"></a>
+<p><a name="index-Server-Tuning-25"></a>
This tool provides easy access to important server indicators as well as server statistics and an editor for database parameters.
<div class="block-image"><img src="images/tuning.png" alt="images/tuning.png"></div>
Modified: trunk/tora/doc/help/unittest.html
===================================================================
--- trunk/tora/doc/help/unittest.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/unittest.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -36,7 +36,7 @@
<h3 class="section">4.5 PL/SQL Unit Tester</h3>
-<p><a name="index-PL_002fSQL-Unit-Tester-23"></a>
+<p><a name="index-PL_002fSQL-Unit-Tester-24"></a>
This tool allows you to run procedures, functions,
and package members independently. Selecting proper
PL/SQL unit will result in anonymous PL/SQL block
Modified: trunk/tora/doc/help/worksheet.html
===================================================================
--- trunk/tora/doc/help/worksheet.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/worksheet.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -34,7 +34,7 @@
<h3 class="section">4.1 SQL Editor</h3>
-<p><a name="index-SQL-Editor-19"></a>
+<p><a name="index-SQL-Editor-20"></a>
This tool provides a way to execute arbitrary SQL or PL/SQL code and also investigate how it is executed and it's resource consumption.
<div class="block-image"><img src="images/worksheet.png" alt="images/worksheet.png"></div>
Modified: trunk/tora/doc/help/workspace.html
===================================================================
--- trunk/tora/doc/help/workspace.html 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/workspace.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -47,6 +47,7 @@
<!-- @item @uref{charts.html,Using charts} -->
<!-- @item @uref{searchreplace.html,Search & replace} -->
<!-- @item @uref{preferences.html,Options} -->
+<!-- @item @xpref{advancedpreferences,Advanced preferences} -->
<!-- @item @uref{common.html,Other common elements} -->
<!-- @end itemize -->
<ul class="menu">
@@ -58,7 +59,8 @@
<li><a accesskey="6" href="charts.html#charts">Using charts</a>
<li><a accesskey="7" href="searchreplace.html#searchreplace">Search & Replace</a>
<li><a accesskey="8" href="preferences.html#preferences">Options</a>
-<li><a accesskey="9" href="common.html#common">Other common elements</a>
+<li><a accesskey="9" href="advancedpreferences.html#advancedpreferences">Advanced preferences</a>
+<li><a href="common.html#common">Other common elements</a>
</ul>
</body></html>
Modified: trunk/tora/doc/help/workspace.texi
===================================================================
--- trunk/tora/doc/help/workspace.texi 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/doc/help/workspace.texi 2010-11-27 13:06:51 UTC (rev 3826)
@@ -14,6 +14,7 @@
@c @item @uref{charts.html,Using charts}
@c @item @uref{searchreplace.html,Search & replace}
@c @item @uref{preferences.html,Options}
+@c @item @xpref{advancedpreferences,Advanced preferences}
@c @item @uref{common.html,Other common elements}
@c @end itemize
@@ -27,6 +28,7 @@
* Using charts:charts.
* Search & Replace:searchreplace.
* Options:preferences.
+* Advanced preferences:advancedpreferences.
* Other common elements:common.
@end menu
Added: trunk/tora/src/help/advancedpreferences.html
===================================================================
--- trunk/tora/src/help/advancedpreferences.html (rev 0)
+++ trunk/tora/src/help/advancedpreferences.html 2010-11-27 13:06:51 UTC (rev 3826)
@@ -0,0 +1 @@
+link ../../doc/help/advancedpreferences.html
\ No newline at end of file
Property changes on: trunk/tora/src/help/advancedpreferences.html
___________________________________________________________________
Added: svn:special
+ *
Modified: trunk/tora/src/toconf.h
===================================================================
--- trunk/tora/src/toconf.h 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/src/toconf.h 2010-11-27 13:06:51 UTC (rev 3826)
@@ -167,6 +167,8 @@
#define DEFAULT_SMTP_PORT 25
#define CONF_STYLE "Style"
#define DEFAULT_STYLE "" //"Cleanlooks"
+#define CONF_ENCODING "Encoding"
+#define DEFAULT_ENCODING "Default"
// code editor
#define CONF_STATIC_CHECKER "StaticChecker"
// connection (general)
Modified: trunk/tora/src/toconfiguration.cpp
===================================================================
--- trunk/tora/src/toconfiguration.cpp 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/src/toconfiguration.cpp 2010-11-27 13:06:51 UTC (rev 3826)
@@ -139,6 +139,7 @@
QString m_style;
QString m_staticChecker; // path+name to static check script (used in code editor)
int m_connectionTestTimeout; // after how many seconds connection should be tested
+ QString m_encoding;
// tooracleconnection
int m_openCursors;
@@ -502,6 +503,7 @@
m_useMaxTextWidthMark = s.value("useMaxTextWidthMark", false).toBool();
m_maxTextWidthMark = s.value("maxTextWidthMark", 75).toInt();
m_connectionTestTimeout = s.value(CONF_CONNECTION_TEST_TIMEOUT, DEFAULT_CONNECTION_TEST_TIMEOUT).toInt();
+ m_encoding = s.value(CONF_ENCODING, DEFAULT_ENCODING).toString();
s.endGroup();
// main window
@@ -742,6 +744,7 @@
s.setValue("useMaxTextWidthMark", m_useMaxTextWidthMark);
s.setValue("maxTextWidthMark", m_maxTextWidthMark);
s.setValue(CONF_CONNECTION_TEST_TIMEOUT, m_connectionTestTimeout);
+ s.setValue(CONF_ENCODING, m_encoding);
s.endGroup();
// main window
@@ -2258,3 +2261,13 @@
{
p->m_staticChecker = v;
} // setStaticChecker
+
+// Default encoding used when reading/writing files
+QString toConfiguration::encoding()
+{
+ return p->m_encoding;
+}
+void toConfiguration::setEncoding(const QString & v)
+{
+ p->m_encoding = v;
+}
Modified: trunk/tora/src/toconfiguration.h
===================================================================
--- trunk/tora/src/toconfiguration.h 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/src/toconfiguration.h 2010-11-27 13:06:51 UTC (rev 3826)
@@ -504,6 +504,10 @@
// code editor
QString staticChecker();
void setStaticChecker(const QString & v);
+
+ // default encoding used when reading/writing files
+ QString encoding();
+ void setEncoding(const QString & v);
};
typedef Loki::SingletonHolder<toConfiguration> toConfigurationSingle;
Modified: trunk/tora/src/tora.qrc
===================================================================
--- trunk/tora/src/tora.qrc 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/src/tora.qrc 2010-11-27 13:06:51 UTC (rev 3826)
@@ -89,6 +89,7 @@
<file>help/output.html</file>
<file>help/plsqleditor.html</file>
<file>help/preferences.html</file>
+ <file>help/advancedpreferences.html</file>
<file>help/rollback.html</file>
<file>help/script.html</file>
<file>help/searchreplace.html</file>
Modified: trunk/tora/src/utils.cpp
===================================================================
--- trunk/tora/src/utils.cpp 2010-11-26 18:08:45 UTC (rev 3825)
+++ trunk/tora/src/utils.cpp 2010-11-27 13:06:51 UTC (rev 3826)
@@ -669,9 +669,20 @@
return file.readAll();
}
+/* Get encoding used to read/write files.
+ */
+QTextCodec * toGetCodec(void)
+{
+ QString codecConf = toConfigurationSingle::Instance().encoding();
+ if (codecConf == DEFAULT_ENCODING)
+ return QTextCodec::codecForLocale();
+ else
+ return QTextCodec::codecForName(codecConf.toAscii());
+} // toGetCodec
+
QString toReadFile(const QString &filename)
{
- QTextCodec *codec = QTextCodec::codecForLocale();
+ QTextCodec *codec = toGetCodec();
return codec->toUnicode(toReadFileB(filename));
}
@@ -722,7 +733,8 @@
QString("Couldn't open %1 for writing").arg(filename).toAscii().constData()));
return false;
}
- file.write(data);
+ QTextCodec *codec = toGetCodec();
+ file.write(codec->fromUnicode(data));
if (file.error() != QFile::NoError)
{
TOMessageBox::warning(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2011-01-06 10:45:01
|
Revision: 3860
http://tora.svn.sourceforge.net/tora/?rev=3860&view=rev
Author: subik
Date: 2011-01-06 10:44:55 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
more fixes for trotl install
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
Added Paths:
-----------
trunk/tora/cmake/modules/LibSuffix.cmake
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2011-01-06 08:32:23 UTC (rev 3859)
+++ trunk/tora/CMakeLists.txt 2011-01-06 10:44:55 UTC (rev 3860)
@@ -54,6 +54,8 @@
#Set the custom CMake module directory where our include/lib finders are
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+INCLUDE(LibSuffix)
+
#Project Setup
PROJECT(TOra)
#Set our version values
Added: trunk/tora/cmake/modules/LibSuffix.cmake
===================================================================
--- trunk/tora/cmake/modules/LibSuffix.cmake (rev 0)
+++ trunk/tora/cmake/modules/LibSuffix.cmake 2011-01-06 10:44:55 UTC (rev 3860)
@@ -0,0 +1,24 @@
+# some system (rpm builds) setup LIB_SUFFIX for cmake. If there is no set, try to get it from system
+IF (NOT LIB_SUFFIX)
+ MESSAGE(STATUS "")
+ MESSAGE(STATUS "LIB_SUFFIX variable is not defined. It will be autodetected now.")
+ MESSAGE(STATUS "You can set it manually with -DLIB_SUFFIX=<value> (64 for example)")
+ IF (NOT APPLE)
+ # check 64 bit
+ IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
+ SET (LIB_SUFFIX "")
+ ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4)
+ SET (LIB_SUFFIX "64")
+ MESSAGE(STATUS " LIB_SUFFIX is set to '${LIB_SUFFIX}'")
+ ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
+ ELSE (NOT APPLE)
+ SET (LIB_SUFFIX "")
+ ENDIF (NOT APPLE)
+ # BSD does not use lib64 for 64bit libs
+ IF (${CMAKE_SYSTEM_NAME} MATCHES ".*BSD")
+ message(STATUS "LIB_SUFFIX is disabled for *BSD: ${CMAKE_SYSTEM_NAME}")
+ SET (LIB_SUFFIX "")
+ ENDIF()
+ #
+ MESSAGE(STATUS "")
+ENDIF (NOT LIB_SUFFIX)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2011-01-06 13:35:06
|
Revision: 3861
http://tora.svn.sourceforge.net/tora/?rev=3861&view=rev
Author: subik
Date: 2011-01-06 13:34:59 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
hopefully the final fix for lib64
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/cmake/modules/LibSuffix.cmake
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2011-01-06 10:44:55 UTC (rev 3860)
+++ trunk/tora/CMakeLists.txt 2011-01-06 13:34:59 UTC (rev 3861)
@@ -54,8 +54,6 @@
#Set the custom CMake module directory where our include/lib finders are
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
-INCLUDE(LibSuffix)
-
#Project Setup
PROJECT(TOra)
#Set our version values
@@ -77,6 +75,9 @@
# 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)
+
#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)
Modified: trunk/tora/cmake/modules/LibSuffix.cmake
===================================================================
--- trunk/tora/cmake/modules/LibSuffix.cmake 2011-01-06 10:44:55 UTC (rev 3860)
+++ trunk/tora/cmake/modules/LibSuffix.cmake 2011-01-06 13:34:59 UTC (rev 3861)
@@ -3,6 +3,7 @@
MESSAGE(STATUS "")
MESSAGE(STATUS "LIB_SUFFIX variable is not defined. It will be autodetected now.")
MESSAGE(STATUS "You can set it manually with -DLIB_SUFFIX=<value> (64 for example)")
+ MESSAGE(STATUS "CMAKE_SIZEOF_VOID_P=${CMAKE_SIZEOF_VOID_P}")
IF (NOT APPLE)
# check 64 bit
IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2011-01-17 20:51:39
|
Revision: 3868
http://tora.svn.sourceforge.net/tora/?rev=3868&view=rev
Author: tomasstraupis
Date: 2011-01-17 20:51:32 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Add an advanced option to force particular line end type (linux, win, mac) when saving files.
Modified Paths:
--------------
trunk/tora/doc/help/advancedpreferences.html
trunk/tora/doc/help/advancedpreferences.texi
trunk/tora/src/toconf.h
trunk/tora/src/toconfiguration.cpp
trunk/tora/src/toconfiguration.h
trunk/tora/src/utils.cpp
trunk/tora/src/utils.h
Modified: trunk/tora/doc/help/advancedpreferences.html
===================================================================
--- trunk/tora/doc/help/advancedpreferences.html 2011-01-10 18:44:10 UTC (rev 3867)
+++ trunk/tora/doc/help/advancedpreferences.html 2011-01-17 20:51:32 UTC (rev 3868)
@@ -42,7 +42,14 @@
<dl>
<dt><strong>ConnectionTestTimeout</strong><dd> TOra can be used to connect to remote databases via poor connection. Such situations require checking if connection is still OK before executing a query or statement. TOra is doing this test by executing a simple time query (on Oracle database that is "select sysdate from dual"). By default TOra will do this test before each statement. If you're working on a reliable connection, you can change this behaviour (and avoid sending excessive queries to database) by seting a number of seconds before a new connection test is done. For example, if you set this value to be 1800, connection test will be performed no earlier than half an hour after the previous test. Note that these tests are done separately for each pooled connection. By default TOra will use three connections but that number could change depending on actual usage.
<br><dt><strong>Encoding</strong><dd> By default when opening files TOra will check your locale and use your encoding. The same encoding will be used when writing files. If you want to use a different encoding and do not want to change your locale encoding - you can use this setting. Value "Default" means default behaviour (using locale encoding) while other values are interpreted as encoding names. Examples of encodings (without quotes): "Windows-1257", "ISO 8859-13" etc. You can get a full list of supported encodings from <a href="http://doc.qt.nokia.com/latest/qtextcodec.html">Qt documentation</a>.
-</dl>
+<br><dt><strong>ForceLineEnd</strong><dd> Linux, Windows and Mac use different characters (or their sequences in case of windows) to mark ends of lines. TOra by default will use end of line depending on operating system you're running. You can change line end marks manually by choosing Edit->Convert End Lines To. Use "ForceLineEnd" option if you want to force all text files to be saved with a particular type of line end. Possible values are:
+ <ul>
+ <li><strong>Default</strong> - do not change line end
+ <li><strong>Linux</strong>
+ <li><strong>Windows</strong>
+ <li><strong>Mac</strong>
+ </ul>
+ </dl>
</body></html>
Modified: trunk/tora/doc/help/advancedpreferences.texi
===================================================================
--- trunk/tora/doc/help/advancedpreferences.texi 2011-01-10 18:44:10 UTC (rev 3867)
+++ trunk/tora/doc/help/advancedpreferences.texi 2011-01-17 20:51:32 UTC (rev 3868)
@@ -9,5 +9,13 @@
TOra can be used to connect to remote databases via poor connection. Such situations require checking if connection is still OK before executing a query or statement. TOra is doing this test by executing a simple time query (on Oracle database that is "select sysdate from dual"). By default TOra will do this test before each statement. If you're working on a reliable connection, you can change this behaviour (and avoid sending excessive queries to database) by seting a number of seconds before a new connection test is done. For example, if you set this value to be 1800, connection test will be performed no earlier than half an hour after the previous test. Note that these tests are done separately for each pooled connection. By default TOra will use three connections but that number could change depending on actual usage.
@item @strong{Encoding}
By default when opening files TOra will check your locale and use your encoding. The same encoding will be used when writing files. If you want to use a different encoding and do not want to change your locale encoding - you can use this setting. Value "Default" means default behaviour (using locale encoding) while other values are interpreted as encoding names. Examples of encodings (without quotes): "Windows-1257", "ISO 8859-13" etc. You can get a full list of supported encodings from @uref{http://doc.qt.nokia.com/latest/qtextcodec.html,Qt documentation}.
+@item @strong{ForceLineEnd}
+ Linux, Windows and Mac use different characters (or their sequences in case of windows) to mark ends of lines. TOra by default will use end of line depending on operating system you're running. You can change line end marks manually by choosing Edit->Convert End Lines To. Use "ForceLineEnd" option if you want to force all text files to be saved with a particular type of line end. Possible values are:
+ @itemize @bullet
+ @item @strong{Default} - do not change line end
+ @item @strong{Linux}
+ @item @strong{Windows}
+ @item @strong{Mac}
+ @end itemize
@end table
Modified: trunk/tora/src/toconf.h
===================================================================
--- trunk/tora/src/toconf.h 2011-01-10 18:44:10 UTC (rev 3867)
+++ trunk/tora/src/toconf.h 2011-01-17 20:51:32 UTC (rev 3868)
@@ -171,6 +171,8 @@
#define DEFAULT_STYLE "" //"Cleanlooks"
#define CONF_ENCODING "Encoding"
#define DEFAULT_ENCODING "Default"
+#define CONF_FORCELINEEND "ForceLineEnd"
+#define DEFAULT_FORCELINEEND "Default"
// code editor
#define CONF_STATIC_CHECKER "StaticChecker"
// connection (general)
Modified: trunk/tora/src/toconfiguration.cpp
===================================================================
--- trunk/tora/src/toconfiguration.cpp 2011-01-10 18:44:10 UTC (rev 3867)
+++ trunk/tora/src/toconfiguration.cpp 2011-01-17 20:51:32 UTC (rev 3868)
@@ -141,6 +141,7 @@
QString m_staticChecker; // path+name to static check script (used in code editor)
int m_connectionTestTimeout; // after how many seconds connection should be tested
QString m_encoding;
+ QString m_forcelineend; // force line end type (win, linux, mac) when saving text files
// tooracleconnection
int m_openCursors;
@@ -506,6 +507,7 @@
m_maxTextWidthMark = s.value("maxTextWidthMark", 75).toInt();
m_connectionTestTimeout = s.value(CONF_CONNECTION_TEST_TIMEOUT, DEFAULT_CONNECTION_TEST_TIMEOUT).toInt();
m_encoding = s.value(CONF_ENCODING, DEFAULT_ENCODING).toString();
+ m_forcelineend = s.value(CONF_FORCELINEEND, DEFAULT_FORCELINEEND).toString();
s.endGroup();
// main window
@@ -748,6 +750,7 @@
s.setValue("maxTextWidthMark", m_maxTextWidthMark);
s.setValue(CONF_CONNECTION_TEST_TIMEOUT, m_connectionTestTimeout);
s.setValue(CONF_ENCODING, m_encoding);
+ s.setValue(CONF_FORCELINEEND, m_forcelineend);
s.endGroup();
// main window
@@ -2283,3 +2286,13 @@
{
p->m_encoding = v;
}
+
+// Force using a particular line end type (win, linux, mac) when saving text files
+QString toConfiguration::forceLineEnd()
+{
+ return p->m_forcelineend;
+}
+void toConfiguration::setForceLineEnd(const QString & v)
+{
+ p->m_forcelineend = v;
+}
Modified: trunk/tora/src/toconfiguration.h
===================================================================
--- trunk/tora/src/toconfiguration.h 2011-01-10 18:44:10 UTC (rev 3867)
+++ trunk/tora/src/toconfiguration.h 2011-01-17 20:51:32 UTC (rev 3868)
@@ -511,6 +511,11 @@
// default encoding used when reading/writing files
QString encoding();
void setEncoding(const QString & v);
+
+ // Force using a particular line end type (win, linux, mac) when saving text files
+ QString forceLineEnd();
+ void setForceLineEnd(const QString & v);
+
};
typedef Loki::SingletonHolder<toConfiguration> toConfigurationSingle;
Modified: trunk/tora/src/utils.cpp
===================================================================
--- trunk/tora/src/utils.cpp 2011-01-10 18:44:10 UTC (rev 3867)
+++ trunk/tora/src/utils.cpp 2011-01-17 20:51:32 UTC (rev 3868)
@@ -734,7 +734,25 @@
return false;
}
QTextCodec *codec = toGetCodec();
- file.write(codec->fromUnicode(data));
+
+ // Check if line end type should be changed to particular one
+ // Note that line end type can be changed manually via menu
+ QString forceLineEndSetting = toConfigurationSingle::Instance().forceLineEnd();
+ if (forceLineEndSetting == "Linux" ||
+ forceLineEndSetting == "Windows" ||
+ forceLineEndSetting == "Mac")
+ {
+ QByteArray ba = data;
+ if (toConfigurationSingle::Instance().forceLineEnd() == "Linux")
+ changeLineEnds(&ba, T_EOL_LF);
+ else if (toConfigurationSingle::Instance().forceLineEnd() == "Windows")
+ changeLineEnds(&ba, T_EOL_CRLF);
+ else if (toConfigurationSingle::Instance().forceLineEnd() == "Mac")
+ changeLineEnds(&ba, T_EOL_CR);
+ file.write(codec->fromUnicode(ba));
+ } else
+ file.write(codec->fromUnicode(data));
+
if (file.error() != QFile::NoError)
{
TOMessageBox::warning(
@@ -1251,3 +1269,58 @@
setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
QSizePolicy::Minimum));
}
+
+// This code is taken from (Q)Scintilla source
+void changeLineEnds(QByteArray * text, int eolModeSet)
+{
+ for (int pos = 0; pos < text->length(); pos++)
+ {
+ if (text->at(pos) == '\r')
+ {
+ if (text->at(pos + 1) == '\n')
+ {
+ // CRLF
+ if (eolModeSet == T_EOL_CR)
+ {
+ text->remove(pos + 1, 1); // Delete the LF
+ }
+ else if (eolModeSet == T_EOL_LF)
+ {
+ text->remove(pos, 1); // Delete the CR
+ }
+ else
+ {
+ pos++;
+ }
+ }
+ else
+ {
+ // CR
+ if (eolModeSet == T_EOL_CRLF)
+ {
+ text->insert(pos + 1, "\n"); // Insert LF
+ pos++;
+ }
+ else if (eolModeSet == T_EOL_LF)
+ {
+ text->insert(pos, "\n"); // Insert LF
+ text->remove(pos + 1, 1); // Delete CR
+ }
+ }
+ }
+ else if (text->at(pos) == '\n')
+ {
+ // LF
+ if (eolModeSet == T_EOL_CRLF)
+ {
+ text->insert(pos, "\r"); // Insert CR
+ pos++;
+ }
+ else if (eolModeSet == T_EOL_CR)
+ {
+ text->insert(pos, "\r"); // Insert CR
+ text->remove(pos + 1, 1); // Delete LF
+ }
+ }
+ }
+} // changeLineEnds
\ No newline at end of file
Modified: trunk/tora/src/utils.h
===================================================================
--- trunk/tora/src/utils.h 2011-01-10 18:44:10 UTC (rev 3867)
+++ trunk/tora/src/utils.h 2011-01-17 20:51:32 UTC (rev 3868)
@@ -539,4 +539,12 @@
}
};
+#define T_EOL_CRLF 0
+#define T_EOL_CR 1
+#define T_EOL_LF 2
+/**
+ * Convert line ends in given byte array to a specified type (windows, linux or mac)
+ */
+void changeLineEnds(QByteArray * text, int eolModeSet);
+
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2011-01-23 22:41:22
|
Revision: 3873
http://tora.svn.sourceforge.net/tora/?rev=3873&view=rev
Author: tomasstraupis
Date: 2011-01-23 22:41:15 +0000 (Sun, 23 Jan 2011)
Log Message:
-----------
Fix searching in Oracle manuals. Add note in documentation about adding Oracle11g manuals as additional help.
Modified Paths:
--------------
trunk/tora/doc/help/additionalhelp.html
trunk/tora/doc/help/additionalhelp.texi
trunk/tora/src/tohelp.cpp
Modified: trunk/tora/doc/help/additionalhelp.html
===================================================================
--- trunk/tora/doc/help/additionalhelp.html 2011-01-20 19:52:18 UTC (rev 3872)
+++ trunk/tora/doc/help/additionalhelp.html 2011-01-23 22:41:15 UTC (rev 3873)
@@ -46,7 +46,7 @@
<dl>
<dt><strong>Remove path</strong><dd>This will remove the currently selected manual from the list.
- <br><dt><strong>Oracle Manuals</strong><dd>This is a quick way to add a collection of manuals. When you select this button a dialog will pop up and ask you for a filename. In Oracle 8 this should be the index page that contains the links to the manuals. Observe that this is not the page which links to the different book categories. In Oracle 9i you should point it to the docindex.htm file in the base directory of the documentation. If successful all the manuals available on the page is added to the list of manuals.
+ <br><dt><strong>Oracle Manuals</strong><dd>This is a quick way to add a collection of manuals. When you select this button a dialog will pop up and ask you for a filename. This should be the page that contains the links to the manuals. Observe that this is not the page which links to the different book categories. In Oracle 9i you should point it to the docindex.htm file in the base directory of the documentation. In Oracle 11g you should point to <i>nav/portal_3.htm</i>. If successful all the manuals available on the page are added to the list of manuals.
<br><dt><strong>Add path</strong><dd>Add a manual to the list of manuals. This pop up a dialog asking for the name of the manual and the location of the manuals table of contents HTML file (toc.html).
Modified: trunk/tora/doc/help/additionalhelp.texi
===================================================================
--- trunk/tora/doc/help/additionalhelp.texi 2011-01-20 19:52:18 UTC (rev 3872)
+++ trunk/tora/doc/help/additionalhelp.texi 2011-01-23 22:41:15 UTC (rev 3873)
@@ -13,7 +13,7 @@
This will remove the currently selected manual from the list.
@item @strong{Oracle Manuals}
-This is a quick way to add a collection of manuals. When you select this button a dialog will pop up and ask you for a filename. In Oracle 8 this should be the index page that contains the links to the manuals. Observe that this is not the page which links to the different book categories. In Oracle 9i you should point it to the docindex.htm file in the base directory of the documentation. If successful all the manuals available on the page is added to the list of manuals.
+This is a quick way to add a collection of manuals. When you select this button a dialog will pop up and ask you for a filename. This should be the page that contains the links to the manuals. Observe that this is not the page which links to the different book categories. In Oracle 9i you should point it to the docindex.htm file in the base directory of the documentation. In Oracle 11g you should point to @i{nav/portal_3.htm}. If successful all the manuals available on the page are added to the list of manuals.
@item @strong{Add path}
Add a manual to the list of manuals. This pop up a dialog asking for the name of the manual and the location of the manuals table of contents HTML file (toc.html).
Modified: trunk/tora/src/tohelp.cpp
===================================================================
--- trunk/tora/src/tohelp.cpp 2011-01-20 19:52:18 UTC (rev 3872)
+++ trunk/tora/src/tohelp.cpp 2011-01-23 22:41:15 UTC (rev 3873)
@@ -478,7 +478,7 @@
disconnect(Help, SIGNAL(textChanged(void)),
this, SLOT(removeSelection(void)));
- if (!item->text(2).isEmpty())
+ if (item && !item->text(2).isEmpty())
{
if (item->text(2).startsWith("qrc:"))
Help->setSource(item->text(2));
@@ -518,7 +518,33 @@
{
QString path = toHelp::path(parent->text(2));
QString filename = path;
- filename.append(QString::fromLatin1("toc.html"));
+ /* We have to find file with index information. This file should be called
+ * either toc.html or index.htm. Note that we cannot use QFile::exists()
+ * to check existance of file in qt resources so that case is hardcoded.
+ */
+ if (filename.startsWith("qrc:"))
+ filename.append(QString::fromLatin1("toc.html"));
+ else
+ {
+ QFile file;
+ // Oracle 11g has an index.htm file with manual index
+ file.setFileName(filename + "index.htm");
+ if (file.exists())
+ filename.append(QString::fromLatin1("index.htm"));
+ else
+ {
+ // toc.html is here for backwards compatibility (say Oracle 9i)
+ // Can probably be removed later (written on 2011-01-23)
+ file.setFileName(filename + "toc.html");
+ if (file.exists())
+ filename.append(QString::fromLatin1("toc.html"));
+ else
+ {
+ // If neither toc.html nor index.htm was found in manual directory - do nothing
+ continue;
+ }
+ }
+ }
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tom...@us...> - 2011-02-19 17:24:37
|
Revision: 3895
http://tora.svn.sourceforge.net/tora/?rev=3895&view=rev
Author: tomasstraupis
Date: 2011-02-19 17:24:30 +0000 (Sat, 19 Feb 2011)
Log Message:
-----------
Add support for DBMS_METADATA.
Modified Paths:
--------------
trunk/tora/doc/help/database.html
trunk/tora/doc/help/database.texi
trunk/tora/doc/help/images/oracle.png
trunk/tora/src/toconf.h
trunk/tora/src/toconfiguration.cpp
trunk/tora/src/toconfiguration.h
trunk/tora/src/tooracleconnection.cpp
trunk/tora/src/tooracleextract.cpp
trunk/tora/src/tooracleextract.h
trunk/tora/src/tooraclesettingui.ui
trunk/tora/src/toresultextract.cpp
Modified: trunk/tora/doc/help/database.html
===================================================================
--- trunk/tora/doc/help/database.html 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/doc/help/database.html 2011-02-19 17:24:30 UTC (rev 3895)
@@ -99,12 +99,24 @@
statement.
<br><dt><strong>shared PLAN_TABLE</strong><dd> Enable this option if you wish to use the system-wide PLAN_TABLE provided by Oracle or a shared
plan table set up by yourself. In this case TOra will never create a plan table for you.
-</dl>
+<br><dt><strong>Extractor options</strong><dd> These options control the way TOra generates object creation scripts (ddl's) in database extractor tool as well as "Script" tab in schema browser.
+ <ul>
+ <li><strong>Use DBMS_METADATA</strong> Use standard Oracle package DBMS_METADATA to get ddl. If not selected TOra will use internal routines to generate ddl.
+ <li><strong>Include storage information</strong>
+ <li><strong>Skip organisation and monitoring</strong> Exclude organisation and monitoring from storage information
+ <li><strong>Skip storage except tablespace</strong> Exclude all storage information except tablespace
+ <li><strong>Include parallel information</strong>
+ <li><strong>Include partition information</strong>
+ <li><strong>Include code</strong>
+ <li><strong>Include header</strong> Include TOra generated script header, containing information such as database name, time of extraction etc.
+ <li><strong>Include prompt</strong>
+ </ul>
+ </dl>
<div class="block-image"><img src="images/mysql.png" alt="images/mysql.png"></div>
<dl>
-<dt><strong>Possibility to break MySql queries</strong><dd> TODO.
+<dt><strong>Possibility to break MySql queries</strong><dd> TODO
<br><dt><strong>When calling create routine statement in worksheet</strong><dd> MySQL routine creation does not support "create or replace" therefore if you try to create new routine and it
already exists you will get an exception. This option controls if TOra should try to avoid such exceptions in
one of supported ways:
Modified: trunk/tora/doc/help/database.texi
===================================================================
--- trunk/tora/doc/help/database.texi 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/doc/help/database.texi 2011-02-19 17:24:30 UTC (rev 3895)
@@ -81,13 +81,26 @@
@item @strong{shared PLAN_TABLE}
Enable this option if you wish to use the system-wide PLAN_TABLE provided by Oracle or a shared
plan table set up by yourself. In this case TOra will never create a plan table for you.
+@item @strong{Extractor options}
+ These options control the way TOra generates object creation scripts (ddl's) in database extractor tool as well as "Script" tab in schema browser.
+ @itemize @bullet
+ @item @strong{Use DBMS_METADATA} Use standard Oracle package DBMS_METADATA to get ddl. If not selected TOra will use internal routines to generate ddl.
+ @item @strong{Include storage information}
+ @item @strong{Skip organisation and monitoring} Exclude organisation and monitoring from storage information
+ @item @strong{Skip storage except tablespace} Exclude all storage information except tablespace
+ @item @strong{Include parallel information}
+ @item @strong{Include partition information}
+ @item @strong{Include code}
+ @item @strong{Include header} Include TOra generated script header, containing information such as database name, time of extraction etc.
+ @item @strong{Include prompt}
+ @end itemize
@end table
@image{images/mysql,13cm}
@table @asis
@item @strong{Possibility to break MySql queries}
- TODO.
+ TODO
@item @strong{When calling create routine statement in worksheet}
MySQL routine creation does not support "create or replace" therefore if you try to create new routine and it
already exists you will get an exception. This option controls if TOra should try to avoid such exceptions in
Modified: trunk/tora/doc/help/images/oracle.png
===================================================================
(Binary files differ)
Modified: trunk/tora/src/toconf.h
===================================================================
--- trunk/tora/src/toconf.h 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/src/toconf.h 2011-02-19 17:24:30 UTC (rev 3895)
@@ -255,6 +255,8 @@
// Extractor. Controls the method used to produce database object extracts
// as well as extraction settings (which information should be extracted).
#define CONF_EXT_GROUP_NAME "ExtractorOptions"
+#define CONF_USE_DBMS_METADATA "UseDbmsMetadata"
+#define DEFAULT_USE_DBMS_METADATA false
#define CONF_EXT_INC_STORAGE "IncludeStorage"
#define DEFAULT_EXT_INC_STORAGE true
#define CONF_EXT_SKIP_ORGMON "SkipOrgMon"
Modified: trunk/tora/src/toconfiguration.cpp
===================================================================
--- trunk/tora/src/toconfiguration.cpp 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/src/toconfiguration.cpp 2011-02-19 17:24:30 UTC (rev 3895)
@@ -258,6 +258,7 @@
// Extractor. Controls the method used to produce database object extracts
// as well as extraction settings (which information should be extracted).
+ bool m_extractorUseDbmsMetadata;
bool m_extractorIncludeSotrage;
bool m_extractorSkipOrgMonInformation;
bool m_extractorSkipStorageExceptTablespaces;
@@ -542,6 +543,7 @@
s.endGroup();
s.beginGroup(CONF_EXT_GROUP_NAME);
+ m_extractorUseDbmsMetadata = s.value(CONF_USE_DBMS_METADATA, DEFAULT_USE_DBMS_METADATA).toBool();
m_extractorIncludeSotrage = s.value(CONF_EXT_INC_STORAGE, DEFAULT_EXT_INC_STORAGE).toBool();
m_extractorSkipOrgMonInformation = s.value(CONF_EXT_SKIP_ORGMON, DEFAULT_EXT_SKIP_ORGMON).toBool();
m_extractorSkipStorageExceptTablespaces = s.value(CONF_EXT_SKIP_STORAGE_EX_TABLESPACE, DEFAULT_EXT_SKIP_STORAGE_EX_TABLESPACE).toBool();
@@ -798,6 +800,7 @@
s.endGroup();
s.beginGroup(CONF_EXT_GROUP_NAME);
+ s.setValue(CONF_USE_DBMS_METADATA, m_extractorUseDbmsMetadata);
s.setValue(CONF_EXT_INC_STORAGE, m_extractorIncludeSotrage);
s.setValue(CONF_EXT_SKIP_ORGMON, m_extractorSkipOrgMonInformation);
s.setValue(CONF_EXT_SKIP_STORAGE_EX_TABLESPACE, m_extractorSkipStorageExceptTablespaces);
@@ -2329,6 +2332,15 @@
p->m_forcelineend = v;
}
+bool toConfiguration::extractorUseDbmsMetadata()
+{
+ return p->m_extractorUseDbmsMetadata;
+}
+void toConfiguration::setExtractorUseDbmsMetadata(bool v)
+{
+ p->m_extractorUseDbmsMetadata = v;
+}
+
bool toConfiguration::extractorIncludeSotrage()
{
return p->m_extractorIncludeSotrage;
Modified: trunk/tora/src/toconfiguration.h
===================================================================
--- trunk/tora/src/toconfiguration.h 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/src/toconfiguration.h 2011-02-19 17:24:30 UTC (rev 3895)
@@ -518,6 +518,8 @@
// Extractor. Controls the method used to produce database object extracts
// as well as extraction settings (which information should be extracted).
+ bool extractorUseDbmsMetadata();
+ void setExtractorUseDbmsMetadata(bool v);
bool extractorIncludeSotrage();
void setExtractorIncludeSotrage(bool v);
bool extractorSkipOrgMonInformation();
Modified: trunk/tora/src/tooracleconnection.cpp
===================================================================
--- trunk/tora/src/tooracleconnection.cpp 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/src/tooracleconnection.cpp 2011-02-19 17:24:30 UTC (rev 3895)
@@ -1453,6 +1453,7 @@
Unlimited->setChecked(false);
}
// extractor group options
+ cbUseDbmsMetadata->setChecked(toConfigurationSingle::Instance().extractorUseDbmsMetadata());
cbIncludeStorage->setChecked(toConfigurationSingle::Instance().extractorIncludeSotrage());
cbSkipOrgMon->setChecked(toConfigurationSingle::Instance().extractorSkipOrgMonInformation());
cbSkiptStorExTablespace->setChecked(toConfigurationSingle::Instance().extractorSkipStorageExceptTablespaces());
@@ -1530,6 +1531,7 @@
toMaxLong = MaxLong->text().toInt();
}
// extractor group options
+ toConfigurationSingle::Instance().setExtractorUseDbmsMetadata(cbUseDbmsMetadata->isChecked());
toConfigurationSingle::Instance().setExtractorIncludeSotrage(cbIncludeStorage->isChecked());
toConfigurationSingle::Instance().setExtractorSkipOrgMonInformation(cbSkipOrgMon->isChecked());
toConfigurationSingle::Instance().setExtractorSkipStorageExceptTablespaces(cbSkiptStorExTablespace->isChecked());
Modified: trunk/tora/src/tooracleextract.cpp
===================================================================
--- trunk/tora/src/tooracleextract.cpp 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/src/tooracleextract.cpp 2011-02-19 17:24:30 UTC (rev 3895)
@@ -7256,6 +7256,27 @@
return ret;
}
+static toSQL SQLDbmsMetadataGetDdl("toOracleExtract:DbmsMetadataGetDdl",
+ "SELECT dbms_metadata.get_ddl(:typ<char[100]>,\n"
+ " :nam<char[100]>,\n"
+ " :sch<char[100]>) FROM dual",
+ "Get object creation ddl using dbms_metadata package");
+
+QString toOracleExtract::createMetadata(toExtract &ext, const QString &owner, const QString &name, const QString &type) const
+{
+ toQuery inf(CONNECTION, SQLDbmsMetadataGetDdl, type, name, owner);
+ if (inf.eof())
+ throw qApp->translate("toOracleExtract", "Couldn't get meta information for %1 %2.%3").arg(type).arg(owner).arg(name);
+
+ QString ret;
+ if (PROMPT)
+ ret = QString("PROMPT CREATE OR REPLACE %1 %2%3\n\n").
+ arg(type).
+ arg(owner).
+ arg(QUOTE(name));
+ return inf.readValue();
+} // createMeatada
+
// Implementation public interface
toOracleExtract::toOracleExtract()
@@ -7606,6 +7627,12 @@
{
clearFlags(ext);
+ if (toConfigurationSingle::Instance().extractorUseDbmsMetadata())
+ {
+ stream << createMetadata(ext, owner, name, type);
+ return;
+ }
+
if (type == "CONSTRAINT")
stream << createConstraint(ext, schema, owner, name);
else if (type == "DATABASE LINK")
Modified: trunk/tora/src/tooracleextract.h
===================================================================
--- trunk/tora/src/tooracleextract.h 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/src/tooracleextract.h 2011-02-19 17:24:30 UTC (rev 3895)
@@ -332,6 +332,10 @@
std::list<QString> &destin) const;
QString migrateTable(toExtract &ext, std::list<QString> &source,
std::list<QString> &destin) const;
+
+ // DBMS_METADATA
+ QString createMetadata(toExtract &ext, const QString &owner, const QString &name, const QString &type) const;
+
public:
// Public interface
Modified: trunk/tora/src/tooraclesettingui.ui
===================================================================
--- trunk/tora/src/tooraclesettingui.ui 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/src/tooraclesettingui.ui 2011-02-19 17:24:30 UTC (rev 3895)
@@ -203,8 +203,15 @@
<property name="title">
<string>Extractor options</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0,0">
+ <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0,0,0,0">
<item>
+ <widget class="QCheckBox" name="cbUseDbmsMetadata">
+ <property name="text">
+ <string>Use DBMS_METADATA</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QCheckBox" name="cbIncludeStorage">
<property name="text">
<string>Include storage information</string>
Modified: trunk/tora/src/toresultextract.cpp
===================================================================
--- trunk/tora/src/toresultextract.cpp 2011-02-19 15:30:11 UTC (rev 3894)
+++ trunk/tora/src/toresultextract.cpp 2011-02-19 17:24:30 UTC (rev 3895)
@@ -123,8 +123,9 @@
if (toIsOracle(conn))
{
- if (type == QString::fromLatin1("TABLE") ||
- type == QString::fromLatin1("TABLE PARTITION"))
+ if ((type == QString::fromLatin1("TABLE") ||
+ type == QString::fromLatin1("TABLE PARTITION")) &&
+ !toConfigurationSingle::Instance().extractorUseDbmsMetadata())
{
objects.insert(objects.end(), QString::fromLatin1("TABLE FAMILY:") + owner + QString::fromLatin1(".") + name);
objects.insert(objects.end(), QString::fromLatin1("TABLE REFERENCES:") + owner + QString::fromLatin1(".") + name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ibr...@us...> - 2011-03-08 16:30:05
|
Revision: 3918
http://tora.svn.sourceforge.net/tora/?rev=3918&view=rev
Author: ibre5041
Date: 2011-03-08 16:29:58 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
The purpose of this patch is to allow to test Tora components in separate
test applications. So far there some "global variables" whose are being
initialized from toMain::toMain and also many tools call toMain's methods
by calling toMainWidget()-><some method>().
Base class for toMain is "class toMainWindow: public QMainWindow".
This patch changes these things:
- return value of toMainWidget() is toMainWindow* not toMain*
- toMainWindow is has 35 new pure virtual methods these methods are
inherited by toMain
- this is a list virtualized methods in toMain, most of them are called
only once. Some of are slots, some of them can be slots.
virtual QMdiArea *workspace() const = 0;
virtual toSearchReplace* searchDialog() = 0;
virtual QMdiSubWindow* lastActiveWindow() const = 0;
virtual toBackgroundLabel* getBackgroundLabel() = 0;
virtual void addChart(toLineChart *chart) = 0;
virtual void removeChart(toLineChart *chart) = 0;
virtual void setupChart(toLineChart *chart) = 0;
virtual void addRecentFile(const QString &filename) = 0;
virtual void addCustomMenu(QMenu *) = 0;
virtual toConnection *addConnection(toConnection *conn, bool def = true) = 0;
virtual std::list<QString> connections(void) = 0;
virtual toConnection &connection(const QString &) = 0;
virtual toConnection ¤tConnection(void) = 0;
virtual QAction* getUndoAction() = 0;
virtual QAction* getRedoAction() = 0;
virtual QAction* getCutAction() = 0;
virtual QAction* getCopyAction() = 0;
virtual QAction* getPasteAction() = 0;
virtual QAction* getSelectAllAction() = 0;
virtual QMenu* getEditMenu() = 0;
virtual toEditWidget *editWidget() = 0;
virtual void createDefault(void) = 0;
virtual void setCoordinates(int, int) = 0;
virtual void editOpenFile(QString file) = 0;
virtual void setNeedCommit(toConnection &conn, bool needCommit = true) = 0;
virtual void editSQL(const QString &str) = 0;
virtual void registerSQLEditor(const QString &) = 0;
virtual void toolWidgetAdded(toToolWidget *tool) = 0;
virtual void toolWidgetRemoved(toToolWidget *tool) = 0;
virtual toDockbar* dockbar(toDocklet *let) = 0;
virtual void checkCaching(void) = 0;
virtual void changeConnection(void) = 0;
virtual void showMessage(const QString &str, bool save, bool log) = 0;
virtual void updateWindowsMenu() = 0;
virtual void windowActivated(QMdiSubWindow *) = 0;
For example how to create test application look at trotl_test3.cpp
Modified Paths:
--------------
trunk/tora/CMakeLists.txt
trunk/tora/src/tobackground.h
trunk/tora/src/tomain.cpp
trunk/tora/src/tomain.h
trunk/tora/src/tomainwindow.h
trunk/tora/src/totool.cpp
trunk/tora/src/trotl/src/Loki/Factory_alt.h
Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt 2011-03-08 14:30:24 UTC (rev 3917)
+++ trunk/tora/CMakeLists.txt 2011-03-08 16:29:58 UTC (rev 3918)
@@ -132,7 +132,7 @@
SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -ggdb3")
SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS} -ggdb3")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -gbdb3 -fno-inline -rdynamic")
+SET(CMAKE_C_FLAGS_DEBUG "-O0 ${CXX_WARNINGS} -ggdb3 -fno-inline -rdynamic")
ENDIF (CMAKE_COMPILER_IS_GNUCC)
Modified: trunk/tora/src/tobackground.h
===================================================================
--- trunk/tora/src/tobackground.h 2011-03-08 14:30:24 UTC (rev 3917)
+++ trunk/tora/src/tobackground.h 2011-03-08 16:29:58 UTC (rev 3918)
@@ -10,7 +10,7 @@
#include "config.h"
#include "totimer.h"
-class toMain;
+class toMainWindow;
/**
@@ -39,7 +39,7 @@
static void init(void);
private:
static int Running;
- toMain* main;
+ toMainWindow* main;
};
#endif
Modified: trunk/tora/src/tomain.cpp
===================================================================
--- trunk/tora/src/tomain.cpp 2011-03-08 14:30:24 UTC (rev 3917)
+++ trunk/tora/src/tomain.cpp 2011-03-08 16:29:58 UTC (rev 3918)
@@ -1255,7 +1255,7 @@
void toMain::setEditWidget(toEditWidget *edit)
{
- toMain *main = toMainWidget();
+ toMain *main = dynamic_cast<toMain*>(toMainWidget());
if (main && edit)
{
if (main->Edit)
@@ -1274,7 +1274,7 @@
if (!edit)
return;
- toMain *main = toMainWidget();
+ toMain *main = dynamic_cast<toMain*>(toMainWidget());
if (main)
main->editEnable(edit,
edit->openEnabled(),
@@ -1300,7 +1300,7 @@
void toMain::editDisable(toEditWidget *edit)
{
- toMain *main = toMainWidget();
+ toMain *main = dynamic_cast<toMain*>(toMainWidget());
if (main)
{
@@ -1948,12 +1948,12 @@
return BackgroundLabel;
}
-toMain* getMainWidget()
+toMainWindow* getMainWidget()
{
QWidgetList widgets = qApp->topLevelWidgets();
for (QWidgetList::iterator it = widgets.begin(); it != widgets.end(); it++)
{
- toMain *main = dynamic_cast<toMain *>((*it));
+ toMainWindow *main = dynamic_cast<toMainWindow *>((*it));
if (main)
return main;
}
@@ -1961,9 +1961,9 @@
return NULL;
}
-toMain* toMainWidget()
+toMainWindow* toMainWidget()
{
- static toMain *main = getMainWidget();
+ static toMainWindow *main = getMainWidget();
// if there is no main widget yet, try to refresh it
if (!main)
main = getMainWidget();
Modified: trunk/tora/src/tomain.h
===================================================================
--- trunk/tora/src/tomain.h 2011-03-08 14:30:24 UTC (rev 3917)
+++ trunk/tora/src/tomain.h 2011-03-08 16:29:58 UTC (rev 3918)
@@ -79,10 +79,12 @@
class toDockbar;
-/** This class defines the main window. Observe that this class will have different baseclass
- * depending on if TOra is a Qt or KDE application. In the case of Qt this will be a
- * QMainWindow descendant.
- */
+/**
+ * This class defines the main window for TOra application
+ *
+ * NOTE: all methods inherited from toMainWindow are marked
+ * with /*virtual*
+*/
class toMain : public toMainWindow
{
Q_OBJECT;
@@ -265,7 +267,6 @@
void createMenus();
void createToolbars();
void createStatusbar();
- void createToolMenus();
void createDocklets();
void createDockbars();
//! \brief Sets tools displaying depending on preferences (tabs/windows)
@@ -282,12 +283,12 @@
* Get the workspace widget of the main window.
* @return Workspace widget.
*/
- QMdiArea *workspace() const
+ /*virtual*/ QMdiArea *workspace() const
{
return Workspace;
}
- toSearchReplace * searchDialog()
+ /*virtual*/ toSearchReplace * searchDialog()
{
return Search;
}
@@ -300,7 +301,7 @@
*
* Use this to find the last active sub window.
*/
- QMdiSubWindow* lastActiveWindow() const
+ /*virtual*/ QMdiSubWindow* lastActiveWindow() const
{
return LastActiveWindow;
}
@@ -309,8 +310,8 @@
* Get the current database connection
* @return Reference to current connection.
*/
- toConnection ¤tConnection(void);
-
+ /*virtual*/ toConnection ¤tConnection(void);
+
/**
* Set the widget to edit through menues and toolbar.
*/
@@ -331,7 +332,7 @@
/** Get current edit widget
*/
- toEditWidget *editWidget()
+ /*virtual*/ toEditWidget *editWidget()
{
return Edit;
}
@@ -341,36 +342,36 @@
*
* This is the tool with the highest priority, usually the SQL worksheet.
*/
- void createDefault(void);
-
+ /*virtual*/ void createDefault(void);
+
/**
* Set coordinates in the statusbar.
*
* Used to indicate current cursor position by child widgets.
*/
- void setCoordinates(int, int);
+ /*virtual*/ void setCoordinates(int, int);
- toBackgroundLabel* getBackgroundLabel();
+ /*virtual*/ toBackgroundLabel* getBackgroundLabel();
/**
* Get a list of currently open connections.
* @return List of connection names. The returned list can then be used by
* @ref connection to get the actual connection.
*/
- std::list<QString> connections(void);
+ /*virtual*/ std::list<QString> connections(void);
/** Get a connection identified by a string.
* @return A reference to a connection.
* @exception QString If connection wasn't found.
*/
- toConnection &connection(const QString &);
+ /*virtual*/ toConnection &connection(const QString &);
/** Set if a connection needs to be committed. Also updates visual feedback in interface.
*/
- void setNeedCommit(toConnection &conn, bool needCommit = true);
+ /*virtual*/ void setNeedCommit(toConnection &conn, bool needCommit = true);
/** Edit an SQL statement in the SQL editor if any connected.
* @param str Identifier of the SQL to edit.
*/
- void editSQL(const QString &str);
+ /*virtual*/ void editSQL(const QString &str);
/**
* Register a tool which to use as an SQL editor. When something
* is to be edited first a toolwindow will be created and the @ref
@@ -381,16 +382,16 @@
* editor. This is the value which is passed to the
* @ref toTool::customSetup member.
*/
- void registerSQLEditor(const QString &);
+ /*virtual*/ void registerSQLEditor(const QString &);
/** Called by @ref toTool when a new tool is created.
* @param tool The tool widget created.
*/
- void toolWidgetAdded(toToolWidget *tool);
+ /*virtual*/ void toolWidgetAdded(toToolWidget *tool);
/** Called by @ref toToolWidget when a new tool is about to be destroyed.
* @param tool The tool widget created.
*/
- void toolWidgetRemoved(toToolWidget *tool);
+ /*virtual*/ void toolWidgetRemoved(toToolWidget *tool);
/** Export data to a map.
* @param data A map that can be used to recreate the session.
@@ -408,56 +409,56 @@
const QString &prefix);
/** Added chart.
*/
- void addChart(toLineChart *chart);
+ /*virtual*/ void addChart(toLineChart *chart);
/** Removed chart.
*/
- void removeChart(toLineChart *chart);
+ /*virtual*/ void removeChart(toLineChart *chart);
/** Setup chart.
*/
- void setupChart(toLineChart *chart);
+ /*virtual*/ void setupChart(toLineChart *chart);
/** Add recent file
*/
- void addRecentFile(const QString &filename);
+ /*virtual*/ void addRecentFile(const QString &filename);
/**
* allow tools to add custom menus (ie. File, Edit, Sql Editor)
* without giving away public access to menubars.
*
*/
- void addCustomMenu(QMenu *);
+ /*virtual*/ void addCustomMenu(QMenu *);
// access needed to some QActions for creating popup menus
- QAction* getUndoAction()
+ /*virtual*/ QAction* getUndoAction()
{
return undoAct;
}
- QAction* getRedoAction()
+ /*virtual*/ QAction* getRedoAction()
{
return redoAct;
}
- QAction* getCutAction()
+ /*virtual*/ QAction* getCutAction()
{
return cutAct;
}
- QAction* getCopyAction()
+ /*virtual*/ QAction* getCopyAction()
{
return copyAct;
}
- QAction* getPasteAction()
+ /*virtual*/ QAction* getPasteAction()
{
return pasteAct;
}
- QAction* getSelectAllAction()
+ /*virtual*/ QAction* getSelectAllAction()
{
return selectAllAct;
}
- QMenu* getEditMenu()
+ /*virtual*/ QMenu* getEditMenu()
{
return editMenu;
}
@@ -475,7 +476,7 @@
* Add a new connection. The connection itself must already be created.
* Returns the connection or it's duplicate already opened connection.
*/
- toConnection *addConnection(toConnection *conn, bool def = true);
+ /*virtual*/toConnection *addConnection(toConnection *conn, bool def = true);
signals:
/** Invoked to start editing an SQL identifier.
@@ -530,16 +531,16 @@
//bool close();
/** Used to enable/disable entries in the windows menu
*/
- void updateWindowsMenu();
+ /*virtual*/ void updateWindowsMenu();
/** Called when active window is changed.
*/
- void windowActivated(QMdiSubWindow *);
+ /*virtual*/ void windowActivated(QMdiSubWindow *);
/** Used to enable/disable entries in the file menu
*/
void showFileMenu(void);
/** Check if object caching is done.
*/
- void checkCaching(void);
+ /*virtual*/ void checkCaching(void);
/** Save the current TOra session
*/
void saveSession(void);
@@ -551,7 +552,7 @@
void closeSession(void);
/** Change current connection
*/
- void changeConnection(void);
+ /*virtual*/ void changeConnection(void);
/**
* Show a statusbar message.
*
@@ -559,7 +560,7 @@
* @param save save to messages menu
* @param log
*/
- void showMessage(const QString &str, bool save, bool log);
+ /*virtual*/ void showMessage(const QString &str, bool save, bool log);
/**
* Show a busy cursor or other indicators. Must be called from the
@@ -582,7 +583,7 @@
* Open a file in sql worksheet
*
*/
- void editOpenFile(QString file);
+ /*virtual*/ void editOpenFile(QString file);
/**
* Return the toDockbar that manages the docklet. If none
@@ -590,7 +591,7 @@
* is shown.
*
*/
- toDockbar* dockbar(toDocklet *let);
+ /*virtual*/ toDockbar* dockbar(toDocklet *let);
/**
* Handles moving docklet to new dockbar
@@ -657,6 +658,6 @@
/** Get a pointer to the main window
* @return Pointer to main window.
*/
-toMain *toMainWidget(void);
+toMainWindow *toMainWidget(void);
#endif
Modified: trunk/tora/src/tomainwindow.h
===================================================================
--- trunk/tora/src/tomainwindow.h 2011-03-08 14:30:24 UTC (rev 3917)
+++ trunk/tora/src/tomainwindow.h 2011-03-08 16:29:58 UTC (rev 3918)
@@ -44,14 +44,196 @@
#include "config.h"
-#include <qmainwindow.h>
-#include <QMenu>
+#include <QMainWindow>
+class QMdiArea;
+class QMenu;
+class QAction;
+class QMdiSubWindow;
+class toBackgroundLabel;
+class toConnection;
+class toDockbar;
+class toDocklet;
+class toLineChart;
+class toEditWidget;
+class toSearchReplace;
+class toToolWidget;
+
+/**
+ * This class defines abstract base class for application's main window
+ * is base class for @ref toMain
+ */
class toMainWindow : public QMainWindow
{
- Q_OBJECT
+ Q_OBJECT;
public:
- toMainWindow();
+ toMainWindow();
+
+ /**
+ * Get the workspace widget of the main window.
+ * @return Workspace widget.
+ */
+ virtual QMdiArea *workspace() const = 0;
+
+ virtual toSearchReplace* searchDialog() = 0;
+
+ /**
+ * The last active sub window in workspace. MDI area is buggy as
+ * hell and currentSubWindow will not tell you the correct window
+ * if a menu is open, or if a tool has a custom widget (sql
+ * editor), somebody sneezes, etc.
+ *
+ * Use this to find the last active sub window.
+ */
+ virtual QMdiSubWindow* lastActiveWindow() const = 0;
+
+ virtual toBackgroundLabel* getBackgroundLabel() = 0;
+
+ /** Added chart.
+ */
+ virtual void addChart(toLineChart *chart) = 0;
+
+ /** Removed chart.
+ */
+ virtual void removeChart(toLineChart *chart) = 0;
+
+ /** Setup chart.
+ */
+ virtual void setupChart(toLineChart *chart) = 0;
+
+
+ /** Add recent file
+ */
+ virtual void addRecentFile(const QString &filename) = 0;
+
+ /**
+ * allow tools to add custom menus (ie. File, Edit, Sql Editor)
+ * without giving away public access to menubars.
+ *
+ */
+ virtual void addCustomMenu(QMenu *) = 0;
+
+ /**
+ * Add a new connection. The connection itself must already be created.
+ * Returns the connection or it's duplicate already opened connection.
+ */
+ virtual toConnection *addConnection(toConnection *conn, bool def = true) = 0;
+
+ /**
+ * Get a list of currently open connections.
+ * @return List of connection names. The returned list can then be used by
+ * @ref connection to get the actual connection.
+ */
+ virtual std::list<QString> connections(void) = 0;
+
+ /** Get a connection identified by a string.
+ * @return A reference to a connection.
+ * @exception QString If connection wasn't found.
+ */
+ virtual toConnection &connection(const QString &) = 0;
+
+ /**
+ * Get the current database connection
+ * @return Reference to current connection.
+ */
+ virtual toConnection ¤tConnection(void) = 0;
+
+ // access needed to some QActions for creating popup menus
+ virtual QAction* getUndoAction() = 0;
+ virtual QAction* getRedoAction() = 0;
+ virtual QAction* getCutAction() = 0;
+ virtual QAction* getCopyAction() = 0;
+ virtual QAction* getPasteAction() = 0;
+ virtual QAction* getSelectAllAction() = 0;
+ virtual QMenu* getEditMenu() = 0;
+
+ /** Get current edit widget
+ */
+ virtual toEditWidget *editWidget() = 0;
+
+ /**
+ * Create the default tool for the current connection.
+ *
+ * This is the tool with the highest priority, usually the SQL worksheet.
+ */
+ virtual void createDefault(void) = 0;
+
+ /**
+ * Set coordinates in the statusbar.
+ *
+ * Used to indicate current cursor position by child widgets.
+ */
+ virtual void setCoordinates(int, int) = 0;
+
+ /**
+ * Open a file in sql worksheet
+ */
+ virtual void editOpenFile(QString file) = 0;
+
+ /** Set if a connection needs to be committed. Also updates visual feedback in interface.
+ */
+ virtual void setNeedCommit(toConnection &conn, bool needCommit = true) = 0;
+
+ /** Edit an SQL statement in the SQL editor if any connected.
+ * @param str Identifier of the SQL to edit.
+ */
+ virtual void editSQL(const QString &str) = 0;
+
+ /**
+ * Register a tool which to use as an SQL editor. When something
+ * is to be edited first a toolwindow will be created and the @ref
+ * sqlEditor will be emited, so the SQL editor must connect to
+ * this signal as well.
+ *
+ * @param toolid Which tool identifier to register as the SQL
+ * editor. This is the value which is passed to the
+ * @ref toTool::customSetup member.
+ */
+ virtual void registerSQLEditor(const QString &) = 0;
+
+ /** Called by @ref toTool when a new tool is created.
+ * @param tool The tool widget created.
+ */
+ virtual void toolWidgetAdded(toToolWidget *tool) = 0;
+
+ /** Called by @ref toToolWidget when a new tool is about to be destroyed.
+ * @param tool The tool widget created.
+ */
+ virtual void toolWidgetRemoved(toToolWidget *tool) = 0;
+
+ /**
+ * Return the toDockbar that manages the docklet. If none
+ * currently manages the docklet, returns what will if the docklet
+ * is shown.
+ *
+ */
+ virtual toDockbar* dockbar(toDocklet *let) = 0;
+
+public slots:
+ /** Check if object caching is done.
+ */
+ virtual void checkCaching(void) = 0;
+
+ /** Change current connection
+ */
+ virtual void changeConnection(void) = 0;
+
+ /**
+ * Show a statusbar message.
+ *
+ * @param str message to show
+ * @param save save to messages menu
+ * @param log
+ */
+ virtual void showMessage(const QString &str, bool save, bool log) = 0;
+
+ /** Used to enable/disable entries in the windows menu
+ */
+ virtual void updateWindowsMenu() = 0;
+
+ /** Called when active window is changed.
+ */
+ virtual void windowActivated(QMdiSubWindow *) = 0;
};
#endif
Modified: trunk/tora/src/totool.cpp
===================================================================
--- trunk/tora/src/totool.cpp 2011-03-08 14:30:24 UTC (rev 3917)
+++ trunk/tora/src/totool.cpp 2011-03-08 16:29:58 UTC (rev 3918)
@@ -258,7 +258,7 @@
QWidget* toTool::createWindow()
{
- toMain *main = toMainWidget();
+ toMainWindow *main = toMainWidget();
QWidget *newWin = 0;
try
Modified: trunk/tora/src/trotl/src/Loki/Factory_alt.h
===================================================================
--- trunk/tora/src/trotl/src/Loki/Factory_alt.h 2011-03-08 14:30:24 UTC (rev 3917)
+++ trunk/tora/src/trotl/src/Loki/Factory_alt.h 2011-03-08 16:29:58 UTC (rev 3918)
@@ -290,10 +290,10 @@
void dump() const {
typename parent::FctRegistry::const_iterator i;
- for(i = parent::mRegistry.begin(); i != parent::mRegistry.end(); ++i)
- {
- std::cout << "Key:" << i->first << std::endl;
- }
+ /* for(i = parent::mRegistry.begin(); i != parent::mRegistry.end(); ++i) */
+ /* { */
+ /* std::cout << "Key:" << i->first << std::endl; */
+ /* } */
}
private:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X