You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ger...@us...> - 2012-04-07 23:09:43
|
Revision: 6612
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6612&view=rev
Author: gerdwagner
Date: 2012-04-07 23:09:37 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
When a table was removed from a query builder graph join types of remaining joins were reset to the default inner join type.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-04-07 22:58:12 UTC (rev 6611)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-04-07 23:09:37 UTC (rev 6612)
@@ -64,7 +64,8 @@
Bug fixes:
-When a table was removed from a query builder graph join types of remaining joins were reset to the default inner join type.
+Graph Plugin --> Query Builder:
+ When a table was removed from a query builder graph join types of remaining joins were reset to the default inner join type.
Referesh (F5) didn't work right and didn't delete schema cache files when schema caching was used.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-04-07 22:58:18
|
Revision: 6611
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6611&view=rev
Author: gerdwagner
Date: 2012-04-07 22:58:12 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
When a table was removed from a query builder graph join types of remaining joins were reset to the default inner join type.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintData.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-04-07 15:50:57 UTC (rev 6610)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-04-07 22:58:12 UTC (rev 6611)
@@ -64,6 +64,8 @@
Bug fixes:
+When a table was removed from a query builder graph join types of remaining joins were reset to the default inner join type.
+
Referesh (F5) didn't work right and didn't delete schema cache files when schema caching was used.
Fixed memory leak: Sessions didn't get garbage collected as soon as a popup (code completion, bookmarks, tools popup) was used.
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintData.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintData.java 2012-04-07 15:50:57 UTC (rev 6610)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintData.java 2012-04-07 22:58:12 UTC (rev 6611)
@@ -290,4 +290,9 @@
_fkCols.set(i, tableFramesModel.findColumn(_fkTableName, _fkCols.get(i).getColumnName()));
}
}
+
+ public void setConstraintQueryData(ConstraintQueryData constraintQueryData)
+ {
+ _constraintQueryData = constraintQueryData;
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java 2012-04-07 15:50:57 UTC (rev 6610)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java 2012-04-07 22:58:12 UTC (rev 6611)
@@ -829,6 +829,7 @@
public void setData(ConstraintData constraintData)
{
+ constraintData.setConstraintQueryData(_constraintData.getConstraintQueryData());
_constraintData = constraintData;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-04-07 15:51:04
|
Revision: 6610
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6610&view=rev
Author: gerdwagner
Date: 2012-04-07 15:50:57 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
Fixed some event dispatch thread violations in sql to file export
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java 2012-04-07 14:48:32 UTC (rev 6609)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/ProgressAbortDialog.java 2012-04-07 15:50:57 UTC (rev 6610)
@@ -315,14 +315,23 @@
*/
private void appendToHistory(String string) {
if (this.historyArea != null) {
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append(dateFormat.format(new Date()));
sb.append(": ");
sb.append(string);
sb.append(StringUtilities.getEolStr());
- this.historyArea.append(sb.toString());
- this.historyArea.setCaretPosition(historyArea.getDocument().getLength());
- }
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ historyArea.append(sb.toString());
+ historyArea.setCaretPosition(historyArea.getDocument().getLength());
+ }
+ };
+
+ GUIUtils.processOnSwingEventThread(runnable);
+ }
}
/**
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java 2012-04-07 14:48:32 UTC (rev 6609)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java 2012-04-07 15:50:57 UTC (rev 6610)
@@ -20,9 +20,10 @@
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.text.NumberFormat;
-import javax.swing.JOptionPane;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.ClobDescriptor;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -126,10 +127,20 @@
Object[] params = new Object[] { file, e.getMessage() };
// i18n[TableExportCsvCommand.failedToWriteFile=Failed to write
// file\n{0}\nError message\n{1}\nSee last log entry for details.]
- String msg = s_stringMgr.getString("TableExportCsvCommand.failedToWriteFile", params);
+ final String msg = s_stringMgr.getString("TableExportCsvCommand.failedToWriteFile", params);
s_log.error(msg, e);
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
- return -1;
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
+ }
+ };
+
+ GUIUtils.processOnSwingEventThread(runnable, true);
+
+ return -1;
}
}
@@ -145,113 +156,181 @@
{
Object[] params = new Object[]{command, e.getMessage()};
// i18n[TableExportCsvCommand.failedToExecuteCommand=Failed to execute\n{0}\nError message\n{1}\nSee last log entry for details.]
- String msg = s_stringMgr.getString("TableExportCsvCommand.failedToExecuteCommand", params);
+ final String msg = s_stringMgr.getString("TableExportCsvCommand.failedToExecuteCommand", params);
s_log.error(msg, e);
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
- }
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
+ }
+ };
+
+ GUIUtils.processOnSwingEventThread(runnable, true);
+ }
}
-
- public void execute() throws ExportDataException
- {
- try{
-
- boolean fileIsInUse = false;
-
- TableExportCsvController ctrl;
- do{
- ctrl = createTableExportController();
- if(false == ctrl.isOK())
- {
- return;
- }
+ public void execute() throws ExportDataException
+ {
+ try
+ {
- if (checkMissingData(ctrl.getSeparatorChar())) {
- int choice = JOptionPane.showConfirmDialog(GUIUtils.getMainFrame(),
- i18n.missingClobDataMsg);
- if (choice == JOptionPane.YES_OPTION) {
- // Need to somehow call
- // SQLResultExecuterPanel.reRunSelectedResultTab(true);
- //
- // Something like :
- // SQLResultExecuterPanel panel = getPanel();
- // panel.reRunSelectedResultTab(true);
- //
- // However, that doesn't apply when the user is exporting from the
- // table contents table. There needs to be a more generic way to
- // do this for all tables containing data that is to be exported
- // where some of the fields contain placeholders.
- // For now, we just inform the user and let them either continue
- // or abort and change the configuration manually,
- // re-run the query / reload the table data and re-export.
- }
- if (choice == JOptionPane.NO_OPTION) {
- // abort the export
- return;
- }
- if (choice == JOptionPane.CANCEL_OPTION) {
- // abort the export
- return;
- }
- }
+ boolean fileIsInUse = false;
- this.targetFile = ctrl.getFile();
-
- /*
- * Allow only one export at a time.
- */
- if(fileContainer.add(this.targetFile) == false){
- fileIsInUse = true;
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.ANOTHER_EXPORT_IS_ACTIVE, i18n.TITLE_ANOTHER_EXPORT_IS_ACTIVE, JOptionPane.WARNING_MESSAGE);
- }else {
- fileIsInUse = false;
- }
-
- }while(fileIsInUse);
+ TableExportCsvController ctrl;
+ do
+ {
+ ctrl = createTableExportController();
+ if (false == ctrl.isOK())
+ {
+ return;
+ }
- this.progressController = createProgressController();
+ if (checkMissingData(ctrl.getSeparatorChar()))
+ {
+ int choice = JOptionPane.showConfirmDialog(GUIUtils.getMainFrame(),
+ i18n.missingClobDataMsg);
+ if (choice == JOptionPane.YES_OPTION)
+ {
+ // Need to somehow call
+ // SQLResultExecuterPanel.reRunSelectedResultTab(true);
+ //
+ // Something like :
+ // SQLResultExecuterPanel panel = getPanel();
+ // panel.reRunSelectedResultTab(true);
+ //
+ // However, that doesn't apply when the user is exporting from the
+ // table contents table. There needs to be a more generic way to
+ // do this for all tables containing data that is to be exported
+ // where some of the fields contain placeholders.
+ // For now, we just inform the user and let them either continue
+ // or abort and change the configuration manually,
+ // re-run the query / reload the table data and re-export.
+ }
+ if (choice == JOptionPane.NO_OPTION)
+ {
+ // abort the export
+ return;
+ }
+ if (choice == JOptionPane.CANCEL_OPTION)
+ {
+ // abort the export
+ return;
+ }
+ }
+ this.targetFile = ctrl.getFile();
+ /*
+ * Allow only one export at a time.
+ */
+ if (fileContainer.add(this.targetFile) == false)
+ {
+ fileIsInUse = true;
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.ANOTHER_EXPORT_IS_ACTIVE, i18n.TITLE_ANOTHER_EXPORT_IS_ACTIVE, JOptionPane.WARNING_MESSAGE);
+ }
+ };
- try {
- writtenRows = writeFile(ctrl, createExportData(ctrl));
- } catch (ExportDataException e) {
- // Show an error and re-throw the exception.
- s_log.error(i18n.FAILED);
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.FAILED);
- throw e;
- }
+ GUIUtils.processOnSwingEventThread(runnable, true);
- if(writtenRows >= 0){
- String command = ctrl.getCommand();
+ }
+ else
+ {
+ fileIsInUse = false;
+ }
- if(null != command)
- {
- executeCommand(command);
- } else {
- // i18n[TableExportCsvCommand.writeFileSuccess=Export to file
- // "{0}" is complete.]
- String msg =
- s_stringMgr.getString("TableExportCsvCommand.writeFileSuccess", NumberFormat.getIntegerInstance().format(writtenRows),
- ctrl.getFile().getAbsolutePath());
- if (s_log.isInfoEnabled()) {
- s_log.info(msg);
- }
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
- }
- }else{
- s_log.info(i18n.FAILED);
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.FAILED);
- }
- }finally{
- if(this.targetFile != null){
- this.fileContainer.remove(this.targetFile);
- }
- }
- }
+ } while (fileIsInUse);
- /**
+
+ this.progressController = createProgressController();
+
+
+ try
+ {
+ writtenRows = writeFile(ctrl, createExportData(ctrl));
+ }
+ catch (ExportDataException e)
+ {
+ // Show an error and re-throw the exception.
+ s_log.error(i18n.FAILED);
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.FAILED);
+ }
+ };
+
+ GUIUtils.processOnSwingEventThread(runnable);
+
+ throw e;
+ }
+
+ if (writtenRows >= 0)
+ {
+ String command = ctrl.getCommand();
+
+ if (null != command)
+ {
+ executeCommand(command);
+ }
+ else
+ {
+ // i18n[TableExportCsvCommand.writeFileSuccess=Export to file
+ // "{0}" is complete.]
+ final String msg =
+ s_stringMgr.getString("TableExportCsvCommand.writeFileSuccess", NumberFormat.getIntegerInstance().format(writtenRows),
+ ctrl.getFile().getAbsolutePath());
+ if (s_log.isInfoEnabled())
+ {
+ s_log.info(msg);
+ }
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
+ }
+ };
+
+ GUIUtils.processOnSwingEventThread(runnable, true);
+
+ }
+ }
+ else
+ {
+ s_log.info(i18n.FAILED);
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.FAILED);
+ }
+ };
+
+ GUIUtils.processOnSwingEventThread(runnable, true);
+
+ }
+ }
+ finally
+ {
+ if (this.targetFile != null)
+ {
+ this.fileContainer.remove(this.targetFile);
+ }
+ }
+ }
+
+ /**
* Create a instance of {@link ProgressAbortCallback} if necessary.
* Subclasse may override this.
* @return returns null.
@@ -265,9 +344,28 @@
* @return
*/
protected TableExportCsvController createTableExportController() {
- return new TableExportCsvController();
- }
+ try
+ {
+ final TableExportCsvController[] buf = new TableExportCsvController[1];
+
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ buf[0] = new TableExportCsvController();
+ }
+ };
+ GUIUtils.processOnSwingEventThread(runnable, true);
+
+ return buf[0];
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
/**
* @param separatorChar
* @return
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java 2012-04-07 14:48:32 UTC (rev 6609)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java 2012-04-07 15:50:57 UTC (rev 6610)
@@ -23,6 +23,7 @@
import java.sql.Statement;
import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.gui.action.exportData.ExportDataException;
import net.sourceforge.squirrel_sql.fw.gui.action.exportData.IExportData;
import net.sourceforge.squirrel_sql.fw.gui.action.exportData.ResultSetExportData;
@@ -33,6 +34,8 @@
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import javax.swing.*;
+
/**
* Command for exporting a result set to a file.
*
@@ -105,10 +108,30 @@
* @see net.sourceforge.squirrel_sql.fw.gui.action.AbstractExportCommand#createTableExportController()
*/
@Override
- protected TableExportCsvController createTableExportController() {
- return new ResultSetExportCsvController();
- }
+ protected TableExportCsvController createTableExportController()
+ {
+ try
+ {
+ final ResultSetExportCsvController[] buf = new ResultSetExportCsvController[1];
+ Runnable runnable = new Runnable()
+ {
+ public void run()
+ {
+ buf[0] = new ResultSetExportCsvController();
+ }
+ };
+
+ GUIUtils.processOnSwingEventThread(runnable, true);
+
+ return buf[0];
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
/**
* Create a new {@link ProgressAbortCallback}.
* @see net.sourceforge.squirrel_sql.fw.gui.action.AbstractExportCommand#createProgressController()
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java 2012-04-07 14:48:32 UTC (rev 6609)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/exportData/AbstractDataExportFileWriter.java 2012-04-07 15:50:57 UTC (rev 6610)
@@ -21,6 +21,7 @@
import java.io.File;
import java.text.NumberFormat;
import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
import javax.swing.plaf.SliderUI;
@@ -69,7 +70,7 @@
/**
* Constant, for updating the progress bar each x seconds.
*/
- private static final int FEEDBACK_EVRY_N_SECONDS = 5;
+ private static final int FEEDBACK_EVRY_N_SECONDS = 2;
/**
* The target file.
*/
@@ -178,7 +179,8 @@
*/
private boolean isStatusUpdateNecessary() {
long time = System.currentTimeMillis();
- if((timeOfLastStatusUpdate + FEEDBACK_EVRY_N_SECONDS*1000) < time){
+
+ if((timeOfLastStatusUpdate + TimeUnit.SECONDS.toMillis(FEEDBACK_EVRY_N_SECONDS)) < time){
timeOfLastStatusUpdate = time;
return true;
}else{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-04-07 14:48:39
|
Revision: 6609
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6609&view=rev
Author: gerdwagner
Date: 2012-04-07 14:48:32 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
Referesh (F5) didn't work right and didn't delete schema cache files when schema caching was used.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/SchemaPropertiesController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/SchemaPropertiesPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCache.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCacheSerializer.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/I18NStrings.properties
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/schemainfo/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/SchemaPropertiesController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/SchemaPropertiesController.java 2012-04-07 13:08:25 UTC (rev 6608)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/SchemaPropertiesController.java 2012-04-07 14:48:32 UTC (rev 6609)
@@ -157,33 +157,9 @@
private void onDeleteCache()
{
- File schemaCacheFile = SchemaInfoCacheSerializer.getSchemaCacheFile(_alias);
-
- String aliasName = null == _alias.getName() || 0 == _alias.getName().trim().length() ? "<unnamed>" : _alias.getName();
-
- if(schemaCacheFile.exists())
- {
- if(schemaCacheFile.delete())
- {
- // i18n[SchemaPropertiesController.cacheDeleted=Deleted {0}]
- _app.getMessageHandler().showMessage(s_stringMgr.getString("SchemaPropertiesController.cacheDeleted", schemaCacheFile.getPath()));
- }
- else
- {
- // i18n[SchemaPropertiesController.cacheDeleteFailed=Could not delete {0}]
- _app.getMessageHandler().showWarningMessage(s_stringMgr.getString("SchemaPropertiesController.cacheDeleteFailed", schemaCacheFile.getPath()));
- }
-
- }
- else
- {
- // i18n[SchemaPropertiesController.cacheToDelNotExists=Cache file for Alias "{0}" does not exist. No file was deleted]
- _app.getMessageHandler().showWarningMessage(s_stringMgr.getString("SchemaPropertiesController.cacheToDelNotExists", aliasName));
- }
-
+ SchemaInfoCacheSerializer.deleteCacheFile(_app, _alias, true);
}
-
private void onPrintCacheFileLocation()
{
File schemaCacheFile = SchemaInfoCacheSerializer.getSchemaCacheFile(_alias);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/SchemaPropertiesPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/SchemaPropertiesPanel.java 2012-04-07 13:08:25 UTC (rev 6608)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/SchemaPropertiesPanel.java 2012-04-07 14:48:32 UTC (rev 6609)
@@ -107,14 +107,20 @@
ret.setLayout(new GridBagLayout());
GridBagConstraints gbc;
+ gbc = new GridBagConstraints(0,0,2,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,5,5), 0,0);
+ JLabel label = new JLabel(s_stringMgr.getString("SchemaPropertiesPanel.deleteCacheNote"));
+ label.setForeground(Color.red);
+ ret.add(label, gbc);
+
+
// i18n[SchemaPropertiesPanel.printCacheFileLocation=Print cache file path to message panel]
btnPrintCacheFileLocation = new JButton(s_stringMgr.getString("SchemaPropertiesPanel.printCacheFileLocation"));
- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,5,5), 0,0);
+ gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,5,5), 0,0);
ret.add(btnPrintCacheFileLocation, gbc);
// i18n[SchemaPropertiesPanel.deleteCache=Delete cache file]
btnDeleteCache = new JButton(s_stringMgr.getString("SchemaPropertiesPanel.deleteCache"));
- gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0);
+ gbc = new GridBagConstraints(1,1,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0);
ret.add(btnDeleteCache, gbc);
return ret;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java 2012-04-07 13:08:25 UTC (rev 6608)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java 2012-04-07 14:48:32 UTC (rev 6609)
@@ -203,7 +203,8 @@
*/
void reloadAll(boolean fireSchemaInfoUpdate)
{
- _schemaInfoCache.clearAll();
+ SchemaInfoCacheSerializer.deleteCacheFile(_session.getApplication(), _session.getAlias(), false);
+ _schemaInfoCache = SchemaInfoCacheSerializer.load(_session);
privateLoadAll();
if(fireSchemaInfoUpdate)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCache.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCache.java 2012-04-07 13:08:25 UTC (rev 6608)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCache.java 2012-04-07 14:48:32 UTC (rev 6609)
@@ -408,18 +408,12 @@
}
- void clearAll()
- {
- clearSchemaIndependentData();
-
-
- clearAllSchemaDependentData();
-
- }
-
private void clearAllSchemaDependentData()
{
_tableNames.clear();
+
+ _internalTableNameTreeMap.clear();
+
synchronized(_iTableInfos) {
_iTableInfos.clear();
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCacheSerializer.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCacheSerializer.java 2012-04-07 13:08:25 UTC (rev 6608)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfoCacheSerializer.java 2012-04-07 14:48:32 UTC (rev 6609)
@@ -9,11 +9,13 @@
import java.io.ObjectStreamClass;
import java.util.Hashtable;
+import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLAlias;
import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -199,4 +201,32 @@
schemaCacheFile.delete();
}
}
+
+ public static void deleteCacheFile(IApplication app, ISQLAliasExt alias, boolean verbose)
+ {
+ File schemaCacheFile = SchemaInfoCacheSerializer.getSchemaCacheFile(alias);
+
+ String aliasName = null == alias.getName() || 0 == alias.getName().trim().length() ? "<unnamed>" : alias.getName();
+
+ if (schemaCacheFile.exists())
+ {
+ if (schemaCacheFile.delete())
+ {
+ // i18n[SchemaPropertiesController.cacheDeleted=Deleted {0}]
+ app.getMessageHandler().showMessage(s_stringMgr.getString("SchemaInfoCacheSerializer.cacheDeleted", schemaCacheFile.getPath()));
+ }
+ else
+ {
+ // i18n[SchemaPropertiesController.cacheDeleteFailed=Could not delete {0}]
+ app.getMessageHandler().showWarningMessage(s_stringMgr.getString("SchemaInfoCacheSerializer.cacheDeleteFailed", schemaCacheFile.getPath()));
+ }
+
+ }
+ else if(verbose)
+ {
+ // i18n[SchemaPropertiesController.cacheToDelNotExists=Cache file for Alias "{0}" does not exist. No file was deleted]
+ app.getMessageHandler().showWarningMessage(s_stringMgr.getString("SchemaInfoCacheSerializer.cacheToDelNotExists", aliasName));
+ }
+ }
+
}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/I18NStrings.properties 2012-04-07 13:08:25 UTC (rev 6608)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/I18NStrings.properties 2012-04-07 14:48:32 UTC (rev 6609)
@@ -102,9 +102,7 @@
SchemaPropertiesPanel.printCacheFileLocation=Print cache file path to message panelCtrl
SchemaPropertiesPanel.deleteCache=Delete cache file
+SchemaPropertiesPanel.deleteCacheNote=Note: If caching was changed consider to delete exisiting cache file to make changes work.
-SchemaPropertiesController.cacheDeleted=Deleted {0}
-SchemaPropertiesController.cacheDeleteFailed=Could not delete {0}
-SchemaPropertiesController.cacheToDelNotExists=Cache file for Alias "{0}" does not exist. No file was deleted
SchemaPropertiesController.cacheFilePath=Cache file path for Alias "{0}": {1}
SchemaPropertiesController.cacheFilePathNotExists=Cache file for Alias "{0}" does not exist. If it existed the path would be: {1}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/schemainfo/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/schemainfo/I18NStrings.properties 2012-04-07 13:08:25 UTC (rev 6608)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/schemainfo/I18NStrings.properties 2012-04-07 14:48:32 UTC (rev 6609)
@@ -16,3 +16,8 @@
SchemaInfoCacheSerializer.beginStore=Starting to write schema cache for Alias {0}. file: {1}
SchemaInfoCacheSerializer.endStore=Finished writing schema cache for Alias{0}. file: {1}
+
+
+SchemaInfoCacheSerializer.cacheDeleted=Deleted {0}
+SchemaInfoCacheSerializer.cacheDeleteFailed=Could not delete {0}
+SchemaInfoCacheSerializer.cacheToDelNotExists=Cache file for Alias "{0}" does not exist. No file was deleted
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-04-07 13:08:25 UTC (rev 6608)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-04-07 14:48:32 UTC (rev 6609)
@@ -64,6 +64,8 @@
Bug fixes:
+Referesh (F5) didn't work right and didn't delete schema cache files when schema caching was used.
+
Fixed memory leak: Sessions didn't get garbage collected as soon as a popup (code completion, bookmarks, tools popup) was used.
Connection/Login timeouts (menu File --> Global Preferences --> Tab SQL) as well as canceling the "Connect to" dialog now works cleanly.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-04-07 13:08:33
|
Revision: 6608
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6608&view=rev
Author: gerdwagner
Date: 2012-04-07 13:08:25 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
Fixed memory leak: Sessions didn't get garbage collected as soon as a popup (code completion, bookmarks, tools popup) was used.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/ToolsPopupController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/Completor.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/PopupManager.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompleteCodeAction.java
trunk/sql12/plugins/sqlbookmark/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlbookmark/CompleteBookmarkAction.java
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SimpleSessionListenerManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/event/SimpleSessionListener.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/ToolsPopupController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/ToolsPopupController.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/ToolsPopupController.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -10,6 +10,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.event.SimpleSessionListener;
import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLPanel;
import net.sourceforge.squirrel_sql.fw.completion.CompletionInfo;
import net.sourceforge.squirrel_sql.fw.completion.Completor;
@@ -37,18 +38,27 @@
_session = session;
_toolsPopupCompletorModel = new ToolsPopupCompletorModel();
- _toolsCompletor = new Completor(_sqlEntryPanel.getTextComponent(), _toolsPopupCompletorModel, new Color(255,204,204), true);
- _toolsCompletor.addCodeCompletorListener
- (
- new CompletorListener()
+ CompletorListener completorListener = new CompletorListener()
+ {
+ public void completionSelected(CompletionInfo completion, int replaceBegin, int keyCode, int modifiers)
{
- public void completionSelected(CompletionInfo completion, int replaceBegin, int keyCode, int modifiers)
- {onToolsPopupActionSelected(completion);}
+ onToolsPopupActionSelected(completion);
}
- );
+ };
+ _toolsCompletor = new Completor(_sqlEntryPanel.getTextComponent(), _toolsPopupCompletorModel, completorListener, new Color(255,204,204), true);
+
+ sqlEntryPanel.getSession().addSimpleSessionListener(new SimpleSessionListener()
+ {
+ public void sessionClosed()
+ {
+ _toolsCompletor.disposePopup();
+ }
+ });
+
+
_ctrlTCount = Preferences.userRoot().getInt(PREFS_KEY_CTRL_T_COUNT, 0);
if(3 > _ctrlTCount)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -32,6 +32,7 @@
import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
+import net.sourceforge.squirrel_sql.client.session.event.SimpleSessionListener;
import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
@@ -403,4 +404,14 @@
JdbcConnectionData getJdbcData();
+
+ /**
+ * Simple because it is directly attached to the Session itself
+ * in contrast to SessionListener that is attached to SessionManager.
+ */
+ void addSimpleSessionListener(SimpleSessionListener simpleSessionListener);
+
+ void removeSimpleSessionListener(SimpleSessionListener simpleSessionListener);
+
+
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -52,6 +52,7 @@
import net.sourceforge.squirrel_sql.client.mainframe.action.OpenConnectionCommand;
import net.sourceforge.squirrel_sql.client.mainframe.action.OpenConnectionCommandListener;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
+import net.sourceforge.squirrel_sql.client.session.event.SimpleSessionListener;
import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
import net.sourceforge.squirrel_sql.client.session.parser.ParserEventsProcessor;
@@ -155,7 +156,8 @@
private DefaultExceptionFormatter formatter = new DefaultExceptionFormatter();
private SessionConnectionKeepAlive _sessionConnectionKeepAlive = null;
-
+ private SimpleSessionListenerManager _simpleSessionListenerManager;
+
/**
* Create a new session.
*
@@ -173,9 +175,6 @@
SQLConnection conn, String user, String password,
IIdentifier sessionId)
{
- super();
- _schemaInfo = new SchemaInfo(app);
-
if (app == null)
{
throw new IllegalArgumentException("null IApplication passed");
@@ -197,6 +196,8 @@
throw new IllegalArgumentException("sessionId == null");
}
+ _schemaInfo = new SchemaInfo(app);
+
_app = app;
_driver = driver;
@@ -236,6 +237,7 @@
}
});
startKeepAliveTaskIfNecessary();
+ _simpleSessionListenerManager = new SimpleSessionListenerManager(app, this);
}
private void startKeepAliveTaskIfNecessary() {
@@ -1278,4 +1280,15 @@
return cmd.getSQLConnection();
}
+ @Override
+ public void addSimpleSessionListener(SimpleSessionListener simpleSessionListener)
+ {
+ _simpleSessionListenerManager.addListener(simpleSessionListener);
+ }
+
+ @Override
+ public void removeSimpleSessionListener(SimpleSessionListener simpleSessionListener)
+ {
+ _simpleSessionListenerManager.removeListener(simpleSessionListener);
+ }
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SimpleSessionListenerManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SimpleSessionListenerManager.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SimpleSessionListenerManager.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -0,0 +1,62 @@
+package net.sourceforge.squirrel_sql.client.session;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.session.event.SessionAdapter;
+import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
+import net.sourceforge.squirrel_sql.client.session.event.SimpleSessionListener;
+
+import java.util.ArrayList;
+
+public class SimpleSessionListenerManager
+{
+ private final IApplication _app;
+ private final Session _session;
+ private ArrayList<SimpleSessionListener> _listeners = new ArrayList<SimpleSessionListener>();
+ private final SessionAdapter _sessionAdapter;
+
+ public SimpleSessionListenerManager(IApplication app, Session session)
+ {
+ _app = app;
+ _session = session;
+
+ _sessionAdapter = new SessionAdapter()
+ {
+ @Override
+ public void sessionClosed(SessionEvent evt)
+ {
+ onSessionClosed(evt);
+ }
+ };
+
+ _app.getSessionManager().addSessionListener(_sessionAdapter);
+
+ }
+
+ private void onSessionClosed(SessionEvent evt)
+ {
+ if(false == evt.getSession().getIdentifier().equals(_session.getIdentifier()))
+ {
+ return;
+ }
+
+ SimpleSessionListener[] simpleSessionListeners = _listeners.toArray(new SimpleSessionListener[_listeners.size()]);
+
+ for (SimpleSessionListener simpleSessionListener : simpleSessionListeners)
+ {
+ simpleSessionListener.sessionClosed();
+ }
+
+ _app.getSessionManager().removeSessionListener(_sessionAdapter);
+ }
+
+ public void addListener(SimpleSessionListener simpleSessionListener)
+ {
+ _listeners.add(simpleSessionListener);
+
+ }
+
+ public void removeListener(SimpleSessionListener simpleSessionListener)
+ {
+ _listeners.remove(simpleSessionListener);
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/event/SimpleSessionListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/event/SimpleSessionListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/event/SimpleSessionListener.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -0,0 +1,11 @@
+package net.sourceforge.squirrel_sql.client.session.event;
+
+
+/**
+ * Simple because it is directly attached to the Session itself
+ * in contrast to SessionListener that is attached to SessionManager.
+ */
+public interface SimpleSessionListener
+{
+ public void sessionClosed();
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -83,7 +83,7 @@
private final ObjectTreeModel _model;
/** Current session. */
- transient private final ISession _session;
+ private final ISession _session;
/**
* Collection of popup menus (<TT>JPopupMenu</TT> instances) for the
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-04-07 13:08:25 UTC (rev 6608)
@@ -64,6 +64,8 @@
Bug fixes:
+Fixed memory leak: Sessions didn't get garbage collected as soon as a popup (code completion, bookmarks, tools popup) was used.
+
Connection/Login timeouts (menu File --> Global Preferences --> Tab SQL) as well as canceling the "Connect to" dialog now works cleanly.
When a Session tab is closed that is not the active tab
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/Completor.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/Completor.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/Completor.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -18,23 +18,20 @@
package net.sourceforge.squirrel_sql.fw.completion;
-
-
import javax.swing.*;
import javax.swing.text.BadLocationException;
import javax.swing.text.JTextComponent;
import javax.swing.text.Keymap;
import java.awt.*;
import java.awt.event.*;
-import java.util.Vector;
public class Completor
{
public static final Color DEFAULT_POP_UP_BACK_GROUND = new Color(255,255,204);
- private Vector<CompletorListener> _listeners = new Vector<CompletorListener>();
- private ICompletorModel _model;
+ private CompletorListener _completorListener;
+ private ICompletorModel _model;
private JPanel _completionPanel;
private JList _completionList;
@@ -67,34 +64,35 @@
private Action[] _originalActions = null;
- public Completor(JTextComponent txtComp, ICompletorModel model)
+ public Completor(JTextComponent txtComp, ICompletorModel model, CompletorListener completorListener)
{
- this(txtComp, model, DEFAULT_POP_UP_BACK_GROUND, false, txtComp); // light yellow
+ this(txtComp, model, completorListener, DEFAULT_POP_UP_BACK_GROUND, false, txtComp); // light yellow
}
- public Completor(JTextComponent txtComp, ICompletorModel model, Color popUpBackGround, boolean useOwnFilterTextField)
+ public Completor(JTextComponent txtComp, ICompletorModel model, CompletorListener completorListener, Color popUpBackGround, boolean useOwnFilterTextField)
{
- this(txtComp, model, popUpBackGround, useOwnFilterTextField, txtComp);
+ this(txtComp, model, completorListener, popUpBackGround, useOwnFilterTextField, txtComp);
}
- public Completor(JTextComponent txtComp, ICompletorModel model, Color popUpBackGround, boolean useOwnFilterTextField, JComponent popupParent)
+ public Completor(JTextComponent txtComp, ICompletorModel model, CompletorListener completorListener, Color popUpBackGround, boolean useOwnFilterTextField, JComponent popupParent)
{
_txtComp = new TextComponentProvider(txtComp, useOwnFilterTextField);
_model = model;
+ _completorListener = completorListener;
+
+
_completionPanel =
new JPanel(new BorderLayout())
{
- private static final long serialVersionUID = 1L;
+ public void setSize(int width, int height)
+ {
+ // without this the completion panel's size will be weird
+ super.setSize(_curCompletionPanelSize.width, _curCompletionPanelSize.height);
+ }
+ };
- public void setSize(int width, int height)
- {
- // without this the completion panel's size will be weird
- super.setSize(_curCompletionPanelSize.width, _curCompletionPanelSize.height);
- }
- };
-
_completionList = new JList(new DefaultListModel());
_completionList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
_completionList.setBackground(popUpBackGround);
@@ -485,30 +483,23 @@
private void fireEvent(CompletionInfo completion, int keyCode, int modifiers)
{
- Vector<CompletorListener> clone = new Vector<CompletorListener>(_listeners);
-
- for (int i = 0; i < clone.size(); i++)
- {
- CompletorListener completorListener = clone.elementAt(i);
- if(_txtComp.editorEqualsFilter())
- {
- completorListener.completionSelected(completion, _currCandidates.getReplacementStart(), keyCode, modifiers);
- }
- else
- {
- completorListener.completionSelected(completion, -1, keyCode, modifiers);
- }
- }
+ if(_txtComp.editorEqualsFilter())
+ {
+ _completorListener.completionSelected(completion, _currCandidates.getReplacementStart(), keyCode, modifiers);
+ }
+ else
+ {
+ _completorListener.completionSelected(completion, -1, keyCode, modifiers);
+ }
}
- public void addCodeCompletorListener(CompletorListener l)
- {
- _listeners.add(l);
- }
-
- public void removeCodeCompletorListener(CompletorListener l)
- {
- _listeners.remove(l);
- }
-
+ public void disposePopup()
+ {
+ //////////////////////////////////////////////////
+ // Both are needed to prevent memory leaks.
+ _popupMan.removeFromRootPane(_completionPanel);
+ _completionPanel.removeAll();
+ //
+ /////////////////////////////////////////////////
+ }
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/PopupManager.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/PopupManager.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/PopupManager.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -113,7 +113,7 @@
}
/** Remove popup panel from previous textComponent root pane */
- private void removeFromRootPane(JComponent c)
+ public void removeFromRootPane(JComponent c)
{
JRootPane rp = c.getRootPane();
if (rp != null)
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -17,23 +17,22 @@
*/
package net.sourceforge.squirrel_sql.plugins.codecompletion;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-
-import javax.swing.*;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.event.SimpleSessionListener;
import net.sourceforge.squirrel_sql.fw.completion.CompletionCandidates;
import net.sourceforge.squirrel_sql.fw.completion.CompletionInfo;
import net.sourceforge.squirrel_sql.fw.completion.Completor;
import net.sourceforge.squirrel_sql.fw.completion.CompletorListener;
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
public class CompleteCodeAction extends SquirrelAction
{
- private static final long serialVersionUID = 1L;
private ISQLEntryPanel _sqlEntryPanel;
private Completor _cc;
private CodeCompletorModel _model;
@@ -51,25 +50,35 @@
_model = new CodeCompletorModel(session, plugin, codeCompletionInfos, sqlEntryPanel.getIdentifier());
+
+ CompletorListener completorListener = new CompletorListener()
+ {
+ public void completionSelected(CompletionInfo completion, int replaceBegin, int keyCode, int modifiers)
+ {
+ performCompletionSelected((CodeCompletionInfo) completion, replaceBegin, keyCode, modifiers);
+ }
+ };
+
if(null != popupParent)
{
- _cc = new Completor(_sqlEntryPanel.getTextComponent(), _model, Completor.DEFAULT_POP_UP_BACK_GROUND, false, popupParent);
+ _cc = new Completor(_sqlEntryPanel.getTextComponent(), _model, completorListener, Completor.DEFAULT_POP_UP_BACK_GROUND, false, popupParent);
}
else
{
- _cc = new Completor(_sqlEntryPanel.getTextComponent(), _model, Completor.DEFAULT_POP_UP_BACK_GROUND, false);
+ _cc = new Completor(_sqlEntryPanel.getTextComponent(), _model, completorListener, Completor.DEFAULT_POP_UP_BACK_GROUND, false);
}
+ session.addSimpleSessionListener(new SimpleSessionListener()
+ {
+ public void sessionClosed()
+ {
+ _cc.disposePopup();
+ }
+ });
+
+
_sqlEntryPanel.addSQLTokenListener(_model.getSQLTokenListener());
- _cc.addCodeCompletorListener
- (
- new CompletorListener()
- {
- public void completionSelected(CompletionInfo completion, int replaceBegin, int keyCode, int modifiers)
- {performCompletionSelected((CodeCompletionInfo) completion, replaceBegin, keyCode, modifiers);}
- }
- );
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -122,7 +122,7 @@
private void initCodeCompletion()
{
- HQLCompleteCodeAction hcca = new HQLCompleteCodeAction(getSession().getApplication(), _resources, this, _connectionProvider, _hqlSyntaxHighlightTokenMatcherProxy);
+ HQLCompleteCodeAction hcca = new HQLCompleteCodeAction(getSession().getApplication(), _resources, this, _connectionProvider, _hqlSyntaxHighlightTokenMatcherProxy, getSession());
JMenuItem item = addToSQLEntryAreaMenu(hcca, "complete");
_resources.configureMenuItem(hcca, item);
registerKeyboardAction(hcca, _resources.getKeyStroke(hcca));
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompleteCodeAction.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompleteCodeAction.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HQLCompleteCodeAction.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -3,6 +3,8 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.event.SimpleSessionListener;
import net.sourceforge.squirrel_sql.fw.completion.CompletionCandidates;
import net.sourceforge.squirrel_sql.fw.completion.CompletionInfo;
import net.sourceforge.squirrel_sql.fw.completion.Completor;
@@ -28,28 +30,35 @@
HibernatePluginResources resources,
HQLEntryPanelManager hqlEntryPanelManager,
IHibernateConnectionProvider hibernateConnectionProvider,
- HqlSyntaxHighlightTokenMatcherProxy hqlSyntaxHighlightTokenMatcherProxy)
+ HqlSyntaxHighlightTokenMatcherProxy hqlSyntaxHighlightTokenMatcherProxy,
+ ISession session)
{
super(app, resources);
_hqlEntryPanel = hqlEntryPanelManager.getEntryPanel();
_hibernateConnectionProvider = hibernateConnectionProvider;
_model = new HQLCodeCompletorModel(hibernateConnectionProvider, new HQLAliasFinder(_hqlEntryPanel), hqlSyntaxHighlightTokenMatcherProxy);
- _cc = new Completor(_hqlEntryPanel.getTextComponent(), _model);
- _cc.addCodeCompletorListener
- (
- new CompletorListener()
- {
- public void completionSelected(CompletionInfo completion, int replaceBegin, int keyCode, int modifiers)
- {
- performCompletionSelected(completion, replaceBegin, keyCode, modifiers);
- }
- }
- );
+ CompletorListener completorListener = new CompletorListener()
+ {
+ public void completionSelected(CompletionInfo completion, int replaceBegin, int keyCode, int modifiers)
+ {
+ performCompletionSelected(completion, replaceBegin, keyCode, modifiers);
+ }
+ };
+ _cc = new Completor(_hqlEntryPanel.getTextComponent(), _model, completorListener);
+ session.addSimpleSessionListener(new SimpleSessionListener()
+ {
+ public void sessionClosed()
+ {
+ _cc.disposePopup();
+ }
+ });
+
+
}
Modified: trunk/sql12/plugins/sqlbookmark/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlbookmark/CompleteBookmarkAction.java
===================================================================
--- trunk/sql12/plugins/sqlbookmark/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlbookmark/CompleteBookmarkAction.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/plugins/sqlbookmark/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlbookmark/CompleteBookmarkAction.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -23,6 +23,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
+import net.sourceforge.squirrel_sql.client.session.event.SimpleSessionListener;
import net.sourceforge.squirrel_sql.fw.completion.CompletionInfo;
import net.sourceforge.squirrel_sql.fw.completion.Completor;
import net.sourceforge.squirrel_sql.fw.completion.CompletorListener;
@@ -41,16 +42,23 @@
_sqlEntryPanel = sqlEntryPanel;
_plugin = plugin;
- _cc = new Completor(_sqlEntryPanel.getTextComponent(), plugin.getBookmarkManager(), new Color(204,255,255), true);
+ CompletorListener completorListener = new CompletorListener()
+ {
+ public void completionSelected(CompletionInfo completion, int replaceBegin, int keyCode, int modifiers)
+ {
+ performCompletionSelected(completion);
+ }
+ };
- _cc.addCodeCompletorListener
- (
- new CompletorListener()
+ _cc = new Completor(_sqlEntryPanel.getTextComponent(), plugin.getBookmarkManager(), completorListener, new Color(204,255,255), true);
+
+ sqlEntryPanel.getSession().addSimpleSessionListener(new SimpleSessionListener()
+ {
+ public void sessionClosed()
{
- public void completionSelected(CompletionInfo completion, int replaceBegin, int keyCode, int modifiers)
- {performCompletionSelected(completion);}
+ _cc.disposePopup();
}
- );
+ });
}
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java 2012-03-26 20:12:53 UTC (rev 6607)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java 2012-04-07 13:08:25 UTC (rev 6608)
@@ -38,6 +38,7 @@
import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
+import net.sourceforge.squirrel_sql.client.session.event.SimpleSessionListener;
import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
@@ -554,4 +555,14 @@
{
System.err.println("MockSession.setTitle: stub not yet implemented");
}
+
+ @Override
+ public void addSimpleSessionListener(SimpleSessionListener simpleSessionListener)
+ {
+ }
+
+ @Override
+ public void removeSimpleSessionListener(SimpleSessionListener simpleSessionListener)
+ {
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2012-03-26 20:12:59
|
Revision: 6607
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6607&view=rev
Author: wis775
Date: 2012-03-26 20:12:53 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Added a ThreadDump to Help => About => Threads
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/AboutBoxDialog.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/AboutBoxDialog.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/AboutBoxDialog.java 2012-03-22 20:30:24 UTC (rev 6606)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/AboutBoxDialog.java 2012-03-26 20:12:53 UTC (rev 6607)
@@ -19,6 +19,7 @@
*/
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -27,9 +28,15 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
import java.net.URL;
+import java.util.Map;
+import java.util.Set;
import java.util.StringTokenizer;
+import javax.management.MXBean;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.JButton;
@@ -39,6 +46,7 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
+import javax.swing.JTextArea;
import javax.swing.Timer;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -54,6 +62,7 @@
import net.sourceforge.squirrel_sql.fw.gui.PropertyPanel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -84,6 +93,8 @@
/** System panel. */
private SystemPanel _systemPnl;
+
+ private ThreadPanel _threadPnl;
/** Close button for dialog. */
private final JButton _closeBtn = new JButton(s_stringMgr.getString("AboutBoxDialog.close"));
@@ -168,6 +179,9 @@
+ (System.currentTimeMillis() - start)
+ "ms");
}
+
+ _threadPnl = new ThreadPanel();
+ _tabPnl.add(s_stringMgr.getString("AboutBoxDialog.threads"), _threadPnl);
_tabPnl.addChangeListener(new ChangeListener()
{
@@ -396,6 +410,8 @@
}
}
+
+
private static class MemoryPanel
extends PropertyPanel
implements ActionListener
@@ -476,4 +492,55 @@
_freeMemoryLbl.setText(Utilities.formatSize(freeMemory, 1));
}
}
+
+ private static final class ThreadPanel extends JPanel
+ {
+ private static final long serialVersionUID = 1L;
+
+ private JTextArea content;
+
+ ThreadPanel()
+ {
+ super();
+ setLayout(new BorderLayout());
+
+ content = new JTextArea(5,20);
+ content.setEditable(false);
+ content.setLineWrap(false);
+ doThreadDump();
+ add(new JScrollPane(content), BorderLayout.CENTER);
+ add(createButtons(), BorderLayout.SOUTH);
+ }
+
+ /**
+ * @return
+ */
+ private JPanel createButtons() {
+ JPanel buttonPanel = new JPanel(new BorderLayout());
+ JButton refreshButton = new JButton(s_stringMgr.getString("ThreadPanel.refresh"));
+ buttonPanel.add(refreshButton, BorderLayout.WEST);
+
+ refreshButton.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ doThreadDump();
+ }
+ });
+
+ return buttonPanel;
+ }
+
+ private void doThreadDump() {
+ StringBuilder sb = new StringBuilder(1000);
+
+ ThreadInfo[] threadInfos = ManagementFactory.getThreadMXBean().dumpAllThreads(true, true);
+ for (ThreadInfo threadInfo : threadInfos) {
+ sb.append(threadInfo.toString());
+ sb.append(StringUtilities.getEolStr());
+ }
+
+ content.setText(sb.toString());
+ }
+ }
}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/I18NStrings.properties 2012-03-22 20:30:24 UTC (rev 6606)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/I18NStrings.properties 2012-03-26 20:12:53 UTC (rev 6607)
@@ -22,6 +22,7 @@
AboutBoxDialog.info.endmemtimer=Ending memory timer (AboutBox)
AboutBoxDialog.systempanelcreatetime=SystemPanel created in
AboutBoxDialog.system=System
+AboutBoxDialog.threads=Threads
AboutBoxDialog.usedheap=Used heap:
HtmlViewerPanel.error.displayurl=Error displaying URL
@@ -96,3 +97,5 @@
MemoryPanel.sessionInfo.toString1=Session: ID={0}, Alias={1}: created at {2}, closed at {3}
MemoryPanel.sessionInfo.toString2=Session: ID={0}, Alias={1}: created at {2}
MemoryPanel.sessionInfo.toString3=Session: ID={0}, Alias={1}: created at {2}, closed at {3}, finalized at {4}
+
+ThreadPanel.refresh=Refresh
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-22 20:30:24 UTC (rev 6606)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-03-26 20:12:53 UTC (rev 6607)
@@ -9,6 +9,9 @@
Enhancements:
+About Dialog:
+ Added a tab for displaying the status off all threads.
+
3463374: Ability to rename SQL Worksheet tabs through Session menu, tab's right mouse menu or shortcut shift F6. (Thanks to Vladislav Vavra for the patch.)
Hibernate Plugin:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-03-22 20:30:30
|
Revision: 6606
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6606&view=rev
Author: gerdwagner
Date: 2012-03-22 20:30:24 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
3463374: forgot to commit the tab's right mouse
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-03-22 18:46:21 UTC (rev 6605)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-03-22 20:30:24 UTC (rev 6606)
@@ -1,24 +1,50 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import javax.swing.Action;
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JSplitPane;
+import javax.swing.JToggleButton;
+import javax.swing.KeyStroke;
+import javax.swing.WindowConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import net.sourceforge.squirrel_sql.client.ApplicationListener;
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DialogWidget;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DockDelegate;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DockWidget;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.IDesktopContainer;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.IWidget;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.TabDelegate;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.TabWidget;
import net.sourceforge.squirrel_sql.client.gui.mainframe.SquirrelDesktopManager;
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.ApplicationListener;
import net.sourceforge.squirrel_sql.client.mainframe.action.CloseAllButCurrentSessionsAction;
import net.sourceforge.squirrel_sql.client.mainframe.action.CloseAllSessionsAction;
+import net.sourceforge.squirrel_sql.client.session.action.CloseSessionAction;
import net.sourceforge.squirrel_sql.client.session.action.CloseSessionWindowAction;
-import net.sourceforge.squirrel_sql.client.session.action.CloseSessionAction;
+import net.sourceforge.squirrel_sql.client.session.action.RenameSessionAction;
import net.sourceforge.squirrel_sql.fw.util.Resources;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import javax.swing.*;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
-
//
public class DockTabDesktopPane extends JComponent implements IDesktopContainer
{
@@ -489,6 +515,9 @@
_tabRightMouseMenu.add(createMenu(_app.getActionCollection().get(CloseSessionAction.class)));
_tabRightMouseMenu.add(createMenu(_app.getActionCollection().get(CloseAllButCurrentSessionsAction.class)));
_tabRightMouseMenu.add(createMenu(_app.getActionCollection().get(CloseAllSessionsAction.class)));
+
+ _tabRightMouseMenu.add(createMenu(_app.getActionCollection().get(RenameSessionAction.class)));
+
}
private JMenuItem createMenu(Action action)
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-22 18:46:21 UTC (rev 6605)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-03-22 20:30:24 UTC (rev 6606)
@@ -9,7 +9,7 @@
Enhancements:
-3463374: Ability to rename SQL Worksheet Tabs through Session menu or shortcut shift F6. (Thanks to Vladislav Vavra for the patch.)
+3463374: Ability to rename SQL Worksheet tabs through Session menu, tab's right mouse menu or shortcut shift F6. (Thanks to Vladislav Vavra for the patch.)
Hibernate Plugin:
- Support of hql results that return plain values instead of mapped objects. Mixes of plain values mapped objects are supported, too.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-03-22 18:46:32
|
Revision: 6605
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6605&view=rev
Author: gerdwagner
Date: 2012-03-22 18:46:21 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Bug fix: Connection/Login timeouts (menu File --> Global Preferences --> Tab SQL) as well as canceling the "Connect to" dialog now works cleanly.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ICompletionCallback.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/OpenConnectionCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/OpenConnectionCommandListener.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java 2012-03-20 18:52:53 UTC (rev 6604)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ConnectToAliasCallBack.java 2012-03-22 18:46:21 UTC (rev 6605)
@@ -1,9 +1,7 @@
package net.sourceforge.squirrel_sql.client.gui.db;
import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.mainframe.action.ConnectToAliasCommand;
import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLAlias;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.WrappedSQLException;
import net.sourceforge.squirrel_sql.fw.gui.ErrorDialog;
@@ -61,7 +59,7 @@
/**
* @see CompletionCallback#errorOccured(Throwable)
*/
- public void errorOccured(Throwable th)
+ public void errorOccured(Throwable th, boolean connectingHasBeenCanceledByUser)
{
if (th instanceof WrappedSQLException)
{
@@ -76,25 +74,41 @@
msg = s_stringMgr.getString("ConnectToAliasCommand.error.cantopen");
}
msg = _sqlAlias.getName() + ": " + msg;
- showErrorDialog(msg, th);
+ if (false == connectingHasBeenCanceledByUser)
+ {
+ showErrorDialog(msg, th);
+ }
+ else
+ {
+ s_log.error(msg, th);
+ }
}
else if (th instanceof ClassNotFoundException)
{
String msg = s_stringMgr.getString("ConnectToAliasCommand.error.driver", _sqlAlias.getName());
- showErrorDialog(msg, th);
+ if (false == connectingHasBeenCanceledByUser)
+ {
+ showErrorDialog(msg, th);
+ }
}
else if (th instanceof NoClassDefFoundError)
{
String msg = s_stringMgr.getString("ConnectToAliasCommand.error.driver", _sqlAlias.getName());
s_log.error(msg, th);
- showErrorDialog(msg, th);
+ if (false == connectingHasBeenCanceledByUser)
+ {
+ showErrorDialog(msg, th);
+ }
}
else
{
String msg = s_stringMgr.getString("ConnectToAliasCommand.error.unexpected", _sqlAlias.getName());
s_log.debug(th.getClass().getName());
s_log.error(msg, th);
- showErrorDialog(msg, th);
+ if (false == connectingHasBeenCanceledByUser)
+ {
+ showErrorDialog(msg, th);
+ }
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ICompletionCallback.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ICompletionCallback.java 2012-03-20 18:52:53 UTC (rev 6604)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/ICompletionCallback.java 2012-03-22 18:46:21 UTC (rev 6605)
@@ -7,5 +7,5 @@
{
void connected(ISQLConnection conn);
void sessionCreated(ISession session);
- void errorOccured(Throwable th);
+ void errorOccured(Throwable th, boolean stopConnection);
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java 2012-03-20 18:52:53 UTC (rev 6604)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java 2012-03-22 18:46:21 UTC (rev 6605)
@@ -152,7 +152,7 @@
/**
* Handler used for connection internal frame actions.
*/
- private static class SheetHandler implements ConnectionInternalFrame.IHandler, Runnable
+ private static class SheetHandler implements ConnectionInternalFrame.IHandler
{
/** The connection internal frame. */
private ConnectionInternalFrame _connSheet;
@@ -232,8 +232,7 @@
_user = user;
_password = password;
_props = props;
- //_app.getThreadPool().addTask(this);
- run();
+ doConnect();
}
/**
@@ -266,20 +265,44 @@
* Execute task. Connect to the alias with the information entered
* in the connection internal frame.
*/
- public void run()
- {
- SQLConnection conn = null;
- final IIdentifier driverID = _alias.getDriverIdentifier();
- final ISQLDriver sqlDriver = _app.getDataCache().getDriver(driverID);
+ public void doConnect()
+ {
+ final IIdentifier driverID = _alias.getDriverIdentifier();
+ final ISQLDriver sqlDriver = _app.getDataCache().getDriver(driverID);
- try
- {
- OpenConnectionCommand cmd = new OpenConnectionCommand(_app,
- _alias, _user, _password, _props);
- cmd.execute();
+ try
+ {
+ final OpenConnectionCommand cmd = new OpenConnectionCommand(_app, _alias, _user, _password, _props);
- if(_alias.isAutoLogon())
+ cmd.execute(new OpenConnectionCommandListener(){
+ @Override
+ public void openConnectionFinished(Throwable t)
+ {
+ afterExecuteFinished(sqlDriver, cmd, t);
+ }
+ });
+
+ }
+ catch (Throwable ex)
+ {
+ _connSheet.executed(false);
+ _callback.errorOccured(ex, _stopConnection);
+ }
+ }
+
+ private void afterExecuteFinished(ISQLDriver sqlDriver, OpenConnectionCommand cmd, Throwable t)
+ {
+ try
+ {
+ if(null != t)
{
+ throw t;
+ }
+
+
+ SQLConnection conn;
+ if (_alias.isAutoLogon())
+ {
// If the user checked Auto Logon but gave wrong username/password
// in the Alias definition. He will be asked to enter username/password again in an extra dialog.
// Here for convenience we transfer these data back into the Alias.
@@ -290,39 +313,36 @@
conn = cmd.getSQLConnection();
- synchronized (this)
- {
- if (_stopConnection)
- {
- if (conn != null)
- {
- closeConnection(conn);
- conn = null;
- }
- }
- else
- {
- // After this it can't be stopped anymore!
- _callback.connected(conn);
- if (_createSession)
- {
- createSession(sqlDriver, conn);
- }
- else
- {
- _connSheet.executed(true);
- }
- }
- }
- }
- catch (Throwable ex)
- {
- _connSheet.executed(false);
- _callback.errorOccured(ex);
- }
- }
+ if (_stopConnection)
+ {
+ if (conn != null)
+ {
+ closeConnection(conn);
+ conn = null;
+ }
+ }
+ else
+ {
+ // After this it can't be stopped anymore!
+ _callback.connected(conn);
+ if (_createSession)
+ {
+ createSession(sqlDriver, conn);
+ }
+ else
+ {
+ _connSheet.executed(true);
+ }
+ }
+ }
+ catch (Throwable th)
+ {
+ _connSheet.executed(false);
+ _callback.errorOccured(th, _stopConnection);
+ }
+ }
- private void closeConnection(ISQLConnection conn)
+ private void closeConnection(ISQLConnection conn)
{
if (conn != null)
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/OpenConnectionCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/OpenConnectionCommand.java 2012-03-20 18:52:53 UTC (rev 6604)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/OpenConnectionCommand.java 2012-03-22 18:46:21 UTC (rev 6605)
@@ -18,7 +18,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+import java.sql.DriverManager;
import java.sql.SQLException;
+import java.util.concurrent.*;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.sql.ISQLAlias;
@@ -31,13 +33,16 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> allows the user to connect to
* an <TT>ISQLAlias</TT>.
*
* @author <A HREF="mailto:co...@us...">Colin Bell</A>
*/
-public class OpenConnectionCommand implements ICommand
+public class OpenConnectionCommand
{
/** Application API. */
private IApplication _app;
@@ -85,28 +90,93 @@
/**
* Display connection internal frame.
- */
- public void execute() throws BaseException
+ * @param openConnectionCommandListener
+ */
+ public void execute(final OpenConnectionCommandListener openConnectionCommandListener) throws BaseException
{
- _conn = null;
- final IIdentifier driverID = _sqlAlias.getDriverIdentifier();
- final ISQLDriver sqlDriver = _app.getDataCache().getDriver(driverID);
- final SQLDriverManager mgr = _app.getSQLDriverManager();
- try
- {
- _conn = mgr.getConnection(sqlDriver, _sqlAlias, _userName, _password, _props);
- }
- catch (SQLException ex)
- {
- throw new WrappedSQLException(ex);
- }
- catch (Throwable th)
- {
- throw new BaseException(th);
- }
+ ExecutorService executorService = Executors.newFixedThreadPool(2);
+
+ Runnable taskConnect = new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ executeConnect();
+ }
+ };
+
+ final Future future = executorService.submit(taskConnect);
+
+ Runnable taskAwaitConnect = new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ awaitConnection(future, openConnectionCommandListener);
+ }
+ };
+ executorService.submit(taskAwaitConnect);
}
- /**
+ public void executeAndWait()
+ {
+ executeConnect();
+ }
+
+ private void awaitConnection(Future future, final OpenConnectionCommandListener openConnectionCommandListener)
+ {
+ try
+ {
+ if (0 < DriverManager.getLoginTimeout())
+ {
+ future.get(DriverManager.getLoginTimeout(), TimeUnit.SECONDS);
+ }
+ else
+ {
+ future.get();
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ openConnectionCommandListener.openConnectionFinished(null);
+ }
+ });
+ }
+ catch (final Throwable t)
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ openConnectionCommandListener.openConnectionFinished(t);
+ }
+ });
+ }
+ }
+
+ private void executeConnect()
+ {
+ _conn = null;
+ final IIdentifier driverID = _sqlAlias.getDriverIdentifier();
+ final ISQLDriver sqlDriver = _app.getDataCache().getDriver(driverID);
+ final SQLDriverManager mgr = _app.getSQLDriverManager();
+ try
+ {
+ _conn = mgr.getConnection(sqlDriver, _sqlAlias, _userName, _password, _props);
+ }
+ catch (SQLException ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ catch (Throwable th)
+ {
+ throw new RuntimeException(th);
+ }
+ }
+
+ /**
* Retrieve the newly opened connection.
*
* @return The <TT>SQLConnection</T>.
@@ -115,5 +185,4 @@
{
return _conn;
}
-
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/OpenConnectionCommandListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/OpenConnectionCommandListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/OpenConnectionCommandListener.java 2012-03-22 18:46:21 UTC (rev 6605)
@@ -0,0 +1,12 @@
+package net.sourceforge.squirrel_sql.client.mainframe.action;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gerd
+ * Date: 20.03.12
+ * Time: 22:43
+ */
+public interface OpenConnectionCommandListener
+{
+ void openConnectionFinished(Throwable t);
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-03-20 18:52:53 UTC (rev 6604)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-03-22 18:46:21 UTC (rev 6605)
@@ -50,6 +50,7 @@
import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel;
import net.sourceforge.squirrel_sql.client.mainframe.action.OpenConnectionCommand;
+import net.sourceforge.squirrel_sql.client.mainframe.action.OpenConnectionCommandListener;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
@@ -272,7 +273,11 @@
s_log.debug("Closing session: " + _id);
}
stopKeepAliveTaskIfNecessary();
- _conn.removePropertyChangeListener(_connLis);
+ if (null != _conn)
+ {
+ // _conn is null when session is closed after reconnect (ctrl t) failure.
+ _conn.removePropertyChangeListener(_connLis);
+ }
_connLis = null;
@@ -541,7 +546,7 @@
*/
public void reconnect()
{
- SQLConnectionState connState = new SQLConnectionState();
+ final SQLConnectionState connState = new SQLConnectionState();
if (_conn != null)
{
try
@@ -553,7 +558,7 @@
s_log.error("Unexpected SQLException", ex);
}
}
- OpenConnectionCommand cmd = new OpenConnectionCommand(_app, _alias,
+ final OpenConnectionCommand cmd = new OpenConnectionCommand(_app, _alias,
_user, _password, connState.getConnectionProperties());
try
{
@@ -569,7 +574,33 @@
}
try
{
- cmd.execute();
+ cmd.execute(new OpenConnectionCommandListener()
+ {
+ @Override
+ public void openConnectionFinished(Throwable t)
+ {
+ reconnectDone(connState, cmd, t);
+ }
+ });
+ }
+ catch (Throwable t)
+ {
+ final String msg = s_stringMgr.getString("Session.reconnError", _alias.getName());
+ _msgHandler.showErrorMessage(msg +"\n" + t.toString());
+ s_log.error(msg, t);
+ _app.getSessionManager().fireReconnectFailed(this);
+ }
+ }
+
+ private void reconnectDone(SQLConnectionState connState, OpenConnectionCommand cmd, Throwable t)
+ {
+ try
+ {
+ if(null != t)
+ {
+ throw t;
+ }
+
_conn = cmd.getSQLConnection();
if (connState != null)
{
@@ -581,11 +612,11 @@
_app.getSessionManager().fireReconnected(this);
startKeepAliveTaskIfNecessary();
}
- catch (Throwable t)
+ catch (Throwable th)
{
final String msg = s_stringMgr.getString("Session.reconnError", _alias.getName());
- _msgHandler.showErrorMessage(msg +"\n" + t.toString());
- s_log.error(msg, t);
+ _msgHandler.showErrorMessage(msg +"\n" + th.toString());
+ s_log.error(msg, th);
_app.getSessionManager().fireReconnectFailed(this);
}
}
@@ -1228,19 +1259,23 @@
/**
* @see net.sourceforge.squirrel_sql.client.session.ISession#createUnmanagedConnection()
*/
- public SQLConnection createUnmanagedConnection() {
- SQLConnectionState connState = new SQLConnectionState();
-
- OpenConnectionCommand cmd = new OpenConnectionCommand(_app, _alias,
- _user, _password, connState.getConnectionProperties());
- try {
- cmd.execute();
- } catch (BaseException e) {
- showErrorMessage(e);
- return null;
- }
-
- return cmd.getSQLConnection();
+ public SQLConnection createUnmanagedConnection()
+ {
+ SQLConnectionState connState = new SQLConnectionState();
+
+ OpenConnectionCommand cmd = new OpenConnectionCommand(_app, _alias,
+ _user, _password, connState.getConnectionProperties());
+ try
+ {
+ cmd.executeAndWait();
+ }
+ catch (Exception e)
+ {
+ showErrorMessage(e);
+ return null;
+ }
+
+ return cmd.getSQLConnection();
}
-
+
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-20 18:52:53 UTC (rev 6604)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-03-22 18:46:21 UTC (rev 6605)
@@ -61,6 +61,8 @@
Bug fixes:
+Connection/Login timeouts (menu File --> Global Preferences --> Tab SQL) as well as canceling the "Connect to" dialog now works cleanly.
+
When a Session tab is closed that is not the active tab
the Session menu used to be disabled and keyboard shortcuts didn't work anymore for the active Session.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6604
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6604&view=rev
Author: gerdwagner
Date: 2012-03-20 18:52:53 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
Hibernate Plugin: Improved transaction handling for data manipulation hqls
Modified Paths:
--------------
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-03-20 01:23:18 UTC (rev 6603)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-03-20 18:52:53 UTC (rev 6604)
@@ -276,6 +276,11 @@
int updateCount = (Integer)rc.callMethod("executeUpdate").getCallee();
ret.setUpdateCount(updateCount);
getRcHibernateSession().callMethod("getTransaction").callMethod("commit");
+
+ // No rollback TX after commit because it leads to
+ // org.hibernate.TransactionException: Transaction not successfully started
+ // tryRollbackTx(ret);
+
}
else
{
@@ -285,21 +290,16 @@
}
queryResList = (List) rc.callMethod("list").getCallee();
+ tryRollbackTx(ret);
+
}
}
catch (Throwable t)
{
ret.setExceptionOccuredWhenExecutingQuery(prepareTransport(t));
+ tryRollbackTx(ret);
}
- try
- {
- getRcHibernateSession().callMethod("getTransaction").callMethod("rollback");
- }
- catch (Throwable t)
- {
- ret.putSessionAdminException("Exception occurced during call of Session.getTransaction().rollback()", prepareTransport(t));
- }
try
{
@@ -319,6 +319,18 @@
return ret;
}
+ private void tryRollbackTx(HqlQueryResult ret)
+ {
+ try
+ {
+ getRcHibernateSession().callMethod("getTransaction").callMethod("rollback");
+ }
+ catch (Throwable t)
+ {
+ ret.putSessionAdminException("Exception occurced during call of Session.getTransaction().rollback()", prepareTransport(t));
+ }
+ }
+
private boolean isDataUpdate(String hqlQuery)
{
return null != hqlQuery
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6603
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6603&view=rev
Author: manningr
Date: 2012-03-20 01:23:18 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
Fixed compile issue.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java 2012-03-15 19:50:49 UTC (rev 6602)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java 2012-03-20 01:23:18 UTC (rev 6603)
@@ -548,4 +548,10 @@
System.err.println("MockSession.getJdbcData: stub not yet implemented");
return null;
}
+
+ @Override
+ public void setTitle(String newTitle)
+ {
+ System.err.println("MockSession.setTitle: stub not yet implemented");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-03-15 19:50:58
|
Revision: 6602
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6602&view=rev
Author: gerdwagner
Date: 2012-03-15 19:50:49 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
When a Session tab is closed that is not the active tab the Session menu used to be disabled and keyboard shortcuts didn't work anymore for the active Session.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameToolBar.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/plugin/DefaultSessionPlugin.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java 2012-03-15 19:12:31 UTC (rev 6601)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java 2012-03-15 19:50:49 UTC (rev 6602)
@@ -1,15 +1,9 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel;
import net.sourceforge.squirrel_sql.client.session.*;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import javax.swing.*;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.InternalFrameAdapter;
-import java.awt.*;
import java.io.File;
public abstract class SessionTabWidget extends TabWidget implements ISessionWidget
@@ -133,7 +127,7 @@
public void widgetActivated(WidgetEvent e)
{
_session.setActiveSessionWindow((ISessionWidget) e.getWidget());
- _session.getApplication().getSessionManager().setActiveSession(_session);
+ _session.getApplication().getSessionManager().setActiveSession(_session, false);
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameToolBar.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameToolBar.java 2012-03-15 19:12:31 UTC (rev 6601)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameToolBar.java 2012-03-15 19:50:49 UTC (rev 6602)
@@ -369,7 +369,7 @@
final Object obj = getSelectedItem();
if (obj instanceof ISession)
{
- _app.getSessionManager().setActiveSession((ISession)obj);
+ _app.getSessionManager().setActiveSession((ISession)obj, false);
}
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/plugin/DefaultSessionPlugin.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/plugin/DefaultSessionPlugin.java 2012-03-15 19:12:31 UTC (rev 6601)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/plugin/DefaultSessionPlugin.java 2012-03-15 19:50:49 UTC (rev 6602)
@@ -141,36 +141,8 @@
{
public void sessionActivated(SessionEvent evt)
{
- final ISession session = evt.getSession();
- EnableMenuTask task = new EnableMenuTask(session);
- session.getApplication().getThreadPool().addTask(task);
+ final boolean enable = isPluginSession(evt.getSession());
+ sessionMenu.setEnabled(enable);
}
}
-
- /**
- * A runnable that implements changing the enabled state of sessionMenu. This class ensures that UI state
- * change occurs in the Swing EDT.
- */
- private class EnableMenuTask implements Runnable
- {
-
- private ISession _session = null;
-
- public EnableMenuTask(ISession session)
- {
- _session = session;
- }
-
- public void run()
- {
- final boolean enable = isPluginSession(_session);
- GUIUtils.processOnSwingEventThread(new Runnable()
- {
- public void run()
- {
- sessionMenu.setEnabled(enable);
- }
- });
- }
- }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java 2012-03-15 19:12:31 UTC (rev 6601)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java 2012-03-15 19:50:49 UTC (rev 6602)
@@ -26,14 +26,10 @@
import javax.swing.event.EventListenerList;
import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.mainframe.action.CloseAllButCurrentSessionsAction;
-import net.sourceforge.squirrel_sql.client.mainframe.action.CloseAllSessionsAction;
import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
import net.sourceforge.squirrel_sql.client.session.event.ISessionListener;
import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
-import net.sourceforge.squirrel_sql.client.session.action.CloseSessionWindowAction;
-import net.sourceforge.squirrel_sql.client.session.action.CloseSessionAction;
import net.sourceforge.squirrel_sql.fw.gui.Dialogs;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.id.IntegerIdentifierFactory;
@@ -140,14 +136,14 @@
_sessionsById.put(sess.getIdentifier(), sess);
fireSessionAdded(sess);
- setActiveSession(sess);
+ setActiveSession(sess, false);
return sess;
}
- public void setActiveSession(ISession session)
+ public void setActiveSession(ISession session, boolean force)
{
- if (session != _activeSession)
+ if (session != _activeSession || force)
{
_activeSession = session;
fireSessionActivated(session);
@@ -313,13 +309,17 @@
{
if (!_sessionsList.isEmpty())
{
- setActiveSession(_sessionsList.getLast());
+ setActiveSession(_sessionsList.getLast(), false);
}
else
{
_activeSession = null;
}
}
+ else
+ {
+ setActiveSession(_activeSession, true);
+ }
_allowedSchemasBySessionID.remove(session.getIdentifier());
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-15 19:12:31 UTC (rev 6601)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-03-15 19:50:49 UTC (rev 6602)
@@ -61,6 +61,9 @@
Bug fixes:
+When a Session tab is closed that is not the active tab
+ the Session menu used to be disabled and keyboard shortcuts didn't work anymore for the active Session.
+
Graph Plugin: Query Builder: Mixed up ASC and DESC in SQL generation and "order by" panel
Hibernate Plugin: Fixed NullPointer that occurred in HQL execution concerning assisted but nonetheless initialized objects.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-03-15 19:12:42
|
Revision: 6601
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6601&view=rev
Author: gerdwagner
Date: 2012-03-15 19:12:31 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
3463374: Ability to rename SQL Worksheet Tabs through Session menu or shortcut shift F6
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-15 19:05:46 UTC (rev 6600)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-03-15 19:12:31 UTC (rev 6601)
@@ -9,7 +9,7 @@
Enhancements:
-3463374: Ability to rename SQL Worksheet Tabs through Session menu or shortcut shift F6
+3463374: Ability to rename SQL Worksheet Tabs through Session menu or shortcut shift F6. (Thanks to Vladislav Vavra for the patch.)
Hibernate Plugin:
- Support of hql results that return plain values instead of mapped objects. Mixes of plain values mapped objects are supported, too.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-03-15 19:05:53
|
Revision: 6600
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6600&view=rev
Author: gerdwagner
Date: 2012-03-15 19:05:46 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
3463374: Ability to rename SQL Worksheet Tabs through Session menu or shortcut shift F6
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/action/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RenameSessionAction.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-03-12 21:35:28 UTC (rev 6599)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-03-15 19:05:46 UTC (rev 6600)
@@ -484,6 +484,8 @@
add(new NextSqlAction(_app));
add(new SelectSqlAction(_app));
add(new OpenSqlHistoryAction(_app));
+
+ add(new RenameSessionAction(_app));
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2012-03-12 21:35:28 UTC (rev 6599)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2012-03-15 19:05:46 UTC (rev 6600)
@@ -311,6 +311,7 @@
addToMenu(rsrc, ReconnectAction.class, menu);
addToMenu(rsrc, CloseSessionWindowAction.class, menu);
addToMenu(rsrc, CloseSessionAction.class, menu);
+ addToMenu(rsrc, RenameSessionAction.class, menu);
menu.add(createSQLResultsCloseMenu(rsrc));
menu.addSeparator();
addToMenu(rsrc, PreviousSessionAction.class, menu);
@@ -324,8 +325,8 @@
menu.addSeparator();
addToMenu(rsrc, NewSQLWorksheetAction.class, menu);
addToMenu(rsrc, NewObjectTreeAction.class, menu);
- menu.addSeparator();
-
+ menu.addSeparator();
+
menu.setEnabled(false);
return menu;
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2012-03-12 21:35:28 UTC (rev 6599)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2012-03-15 19:05:46 UTC (rev 6600)
@@ -227,6 +227,12 @@
/**
+ * Changes the title of this session to the new one.
+ * @param New title of this session.
+ */
+ public void setTitle(String newTitle);
+
+ /**
* Add the passed action to the toolbar of the sessions main window.
*
* @param action Action to be added.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-03-12 21:35:28 UTC (rev 6599)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-03-15 19:05:46 UTC (rev 6600)
@@ -725,7 +725,11 @@
return _title;
}
-
+ public void setTitle(String newTitle)
+ {
+ _title = newTitle;
+ }
+
public String toString()
{
return getTitle();
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RenameSessionAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RenameSessionAction.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RenameSessionAction.java 2012-03-15 19:05:46 UTC (rev 6600)
@@ -0,0 +1,85 @@
+package net.sourceforge.squirrel_sql.client.session.action;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JOptionPane;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ISessionWidget;
+import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+/**
+ * Class responsible for renaming selected session title.
+ * When it is invoked on main session tab, the session itself with all session tabs are renamed.
+ * When is is invoked on the second, third, ... tab, only selected tab is renamed.
+ * If one session tab is renamed and then the session itself is renamed, all tabs including the renamed one are renamed.
+ * @author Vladislav Vavra
+ */
+public class RenameSessionAction extends SquirrelAction
+ implements ISessionAction
+{
+
+ private ISession _session;
+
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(RenameSessionAction.class);
+
+ public RenameSessionAction(IApplication app)
+ {
+ super(app);
+ }
+
+ public void setSession(ISession session)
+ {
+ _session = session;
+ }
+
+ /**
+ * Method for renaming a session.
+ */
+ public void actionPerformed(ActionEvent evt)
+ {
+ setSession(_app.getSessionManager().getActiveSession());
+
+ String newTitle = JOptionPane.showInputDialog(_app.getMainFrame(),
+ s_stringMgr.getString("RenameSessionAction.label"),
+ s_stringMgr.getString("RenameSessionAction.title"),
+ JOptionPane.QUESTION_MESSAGE);
+
+
+ if(null == newTitle)
+ {
+ // Dialog was canceled.
+ return;
+ }
+
+
+ if(!_session.getActiveSessionWindow().equals(_app.getWindowManager().getAllFramesOfSession(_session.getIdentifier())[0]))
+ {
+ _session.getActiveSessionWindow().setTitle(newTitle);
+ }
+ else
+ {
+ _session.setTitle(newTitle);
+ updateGui();
+ }
+ }
+
+ /**
+ * Method for propagating new session title into gui.
+ */
+ private void updateGui() {
+ _app.getMainFrame().repaint();
+ ISessionWidget[] sessionSheets = _app.getWindowManager().getAllFramesOfSession(_session.getIdentifier());
+ if(sessionSheets.length==0) return;
+
+ sessionSheets[0].setTitle(_session.getTitle());
+ for(int i=1;i<sessionSheets.length;i++) {
+ sessionSheets[i].setTitle(_session.getTitle()+" (" + (i + 1) + ")");
+ }
+ }
+}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-03-12 21:35:28 UTC (rev 6599)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-03-15 19:05:46 UTC (rev 6600)
@@ -560,6 +560,11 @@
action.net.sourceforge.squirrel_sql.client.session.action.OpenSqlHistoryAction.name=Open SQL History
action.net.sourceforge.squirrel_sql.client.session.action.OpenSqlHistoryAction.tooltip=Open SQL History
+#Rename session properties
+action.net.sourceforge.squirrel_sql.client.session.action.RenameSessionAction.name=Rename Session/Tab
+action.net.sourceforge.squirrel_sql.client.session.action.RenameSessionAction.tooltip=Change name of session/tab
+menuitem.net.sourceforge.squirrel_sql.client.session.action.RenameSessionAction.accelerator=shift F6
+menuitem.net.sourceforge.squirrel_sql.client.session.action.RenameSessionAction.mnemonic=R
########
@@ -729,7 +734,7 @@
menuitem.net.sourceforge.squirrel_sql.client.mainframe.action.ViewHelpAction.accelerator= F1
menuitem.net.sourceforge.squirrel_sql.client.mainframe.action.ViewHelpAction.mnemonic=H
-menuitem.net.sourceforge.squirrel_sql.client.mainframe.action.ViewLogsAction.accelerator
+menuitem.net.sourceforge.squirrel_sql.client.mainframe.action.ViewLogsAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.client.mainframe.action.ViewLogsAction.mnemonic=L
menuitem.net.sourceforge.squirrel_sql.client.session.action.SessionPropertiesAction.accelerator=
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/action/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/action/I18NStrings.properties 2012-03-12 21:35:28 UTC (rev 6599)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/action/I18NStrings.properties 2012-03-15 19:05:46 UTC (rev 6600)
@@ -1,4 +1,3 @@
-
DeleteSelectedTablesAction.title=Deleting from table(s)/view(s)
DeleteSelectedTablesAction.message=Do you really want to delete all records in the selected table(s)?\n Warning: This operation might also delete records in dependent tables
@@ -15,3 +14,5 @@
SQLFilterAction.singleObjectMessage=You must have a single table or view selected to activate the SQL Filter
+RenameSessionAction.title=Session/Tab Rename
+RenameSessionAction.label=Enter new session/tab label:
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-12 21:35:28 UTC (rev 6599)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-03-15 19:05:46 UTC (rev 6600)
@@ -9,6 +9,8 @@
Enhancements:
+3463374: Ability to rename SQL Worksheet Tabs through Session menu or shortcut shift F6
+
Hibernate Plugin:
- Support of hql results that return plain values instead of mapped objects. Mixes of plain values mapped objects are supported, too.
- Support of data changing hql statements.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-03-12 21:35:38
|
Revision: 6599
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6599&view=rev
Author: gerdwagner
Date: 2012-03-12 21:35:28 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
Hibernate Plugin:
- Support for JDBC standard date/time/timestamp escape strings in hql queries. (String are parsed and converted to hql parameters).
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/EditExtrasAccessor.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/EditExtrasExternalService.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java
trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/JDBCTemporalEscapeParse.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-06 21:57:56 UTC (rev 6598)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-03-12 21:35:28 UTC (rev 6599)
@@ -12,6 +12,7 @@
Hibernate Plugin:
- Support of hql results that return plain values instead of mapped objects. Mixes of plain values mapped objects are supported, too.
- Support of data changing hql statements.
+ - Support for JDBC standard date/time/timestamp escape strings in hql queries. (String are parsed and converted to hql parameters).
DBCopy Plugin:
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/EditExtrasAccessor.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/EditExtrasAccessor.java 2012-03-06 21:57:56 UTC (rev 6598)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/EditExtrasAccessor.java 2012-03-12 21:35:28 UTC (rev 6599)
@@ -2,6 +2,7 @@
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -15,7 +16,8 @@
public static void quoteHQL(ISQLEntryPanel entryPanel, ISession session)
{
- EditExtrasExternalService si = getService(session);
+ // i18n[EditExtrasAccessor.editextrasPluginNeeded=Quoting is only available with the Edit Extras Plugin.\nGet the plugin from www.squirrelsql.org. It's free.]
+ EditExtrasExternalService si = getService(session, s_stringMgr.getString("EditExtrasAccessor.editextrasPluginNeeded"));
if(null != si)
{
@@ -26,7 +28,7 @@
public static void quoteHQLSb(ISQLEntryPanel entryPanel, ISession session)
{
- EditExtrasExternalService si = getService(session);
+ EditExtrasExternalService si = getService(session, s_stringMgr.getString("EditExtrasAccessor.editextrasPluginNeeded"));
if(null != si)
{
@@ -34,13 +36,11 @@
}
}
- private static EditExtrasExternalService getService(ISession session)
+ private static EditExtrasExternalService getService(ISession session, String msg)
{
EditExtrasExternalService si = (EditExtrasExternalService) session.getApplication().getPluginManager().bindExternalPluginService("editextras", EditExtrasExternalService.class);
if (null == si)
{
- // i18n[EditExtrasAccessor.editextrasPluginNeeded=Quoting is only available with the Edit Extras Plugin.\nGet the plugin from www.squirrelsql.org. It's free.]
- String msg = s_stringMgr.getString("EditExtrasAccessor.editextrasPluginNeeded");
JOptionPane.showMessageDialog(session.getApplication().getMainFrame(), msg);
return null;
}
@@ -49,10 +49,21 @@
public static void unquoteHQL(ISQLEntryPanel entryPanel, ISession session)
{
- EditExtrasExternalService si = getService(session);
+ EditExtrasExternalService si = getService(session, s_stringMgr.getString("EditExtrasAccessor.editextrasPluginNeeded"));
if(null != si)
{
si.unquoteSQL(entryPanel);
}
}
+
+ public static String escapeDate(ISQLEntryPanel entryPanel, ISession session)
+ {
+ // i18n[EditExtrasAccessor.editextrasPluginNeededForEscapeDate=Escape date is only available with the Edit Extras Plugin.\nGet the plugin from www.squirrelsql.org. It's free.]
+ EditExtrasExternalService si = getService(session, s_stringMgr.getString("EditExtrasAccessor.editextrasPluginNeededForEscapeDate"));
+ if(null != si)
+ {
+ return si.getDateEscape(GUIUtils.getOwningFrame(entryPanel.getTextComponent()));
+ }
+ return null;
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/EditExtrasExternalService.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/EditExtrasExternalService.java 2012-03-06 21:57:56 UTC (rev 6598)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/EditExtrasExternalService.java 2012-03-12 21:35:28 UTC (rev 6599)
@@ -2,6 +2,8 @@
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
+import java.awt.*;
+
public interface EditExtrasExternalService
{
void quoteSQL(ISQLEntryPanel entryPanel);
@@ -9,4 +11,6 @@
void quoteSQLSb(ISQLEntryPanel entryPanel);
void unquoteSQL(ISQLEntryPanel entryPanel);
+
+ String getDateEscape(Window parentForDialog);
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java 2012-03-06 21:57:56 UTC (rev 6598)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java 2012-03-12 21:35:28 UTC (rev 6599)
@@ -77,9 +77,31 @@
};
unquoteHql.putValue(Action.SHORT_DESCRIPTION, strUnquote);
addToSQLEntryAreaMenu(unquoteHql, "unquote");
+
+ // i18n[HQLEntryPanelManager.escapeDate=Escape date]
+ String strEscapeDate = s_stringMgr.getString("HQLEntryPanelManager.escapeDate");
+ AbstractAction escapeDate = new AbstractAction(strUnquote)
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onEscapeDate();
+ }
+ };
+ unquoteHql.putValue(Action.SHORT_DESCRIPTION, strEscapeDate);
+ addToSQLEntryAreaMenu(escapeDate, "date");
}
+ private void onEscapeDate()
+ {
+ String str = EditExtrasAccessor.escapeDate(getEntryPanel(), getSession());
+ if(null != str)
+ {
+ getEntryPanel().replaceSelection(str);
+ }
+ }
+
+
private void initBookmarks()
{
HQLBookmarksAction hba = new HQLBookmarksAction(getSession().getApplication(), _resources, getEntryPanel());
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-03-06 21:57:56 UTC (rev 6598)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-03-12 21:35:28 UTC (rev 6599)
@@ -5,7 +5,6 @@
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.*;
@@ -38,7 +37,12 @@
{
try
{
+ JDBCTemporalEscapeParse jdbcTemporalEscapeParse = new JDBCTemporalEscapeParse(hqlQuery);
+ if(jdbcTemporalEscapeParse.hasEscapes())
+ {
+ hqlQuery = jdbcTemporalEscapeParse.getHql();
+ }
Class sessionFactoryImplementorClass = (Class) new ReflectionCaller().getClass("org.hibernate.engine.SessionFactoryImplementor", _cl).getCallee();
@@ -243,8 +247,30 @@
try
{
- ReflectionCaller rc = getRcHibernateSession().callMethod("createQuery", hqlQuery);
+ JDBCTemporalEscapeParse jdbcTemporalEscapeParse = new JDBCTemporalEscapeParse(hqlQuery);
+ ReflectionCaller rc;
+ if(jdbcTemporalEscapeParse.hasEscapes())
+ {
+ rc = getRcHibernateSession().callMethod("createQuery", jdbcTemporalEscapeParse.getHql());
+
+ TreeMap<String, Date> datesByParamName = jdbcTemporalEscapeParse.getDatesByParamName();
+ for (String paramName : datesByParamName.keySet())
+ {
+ RCParam param = new RCParam();
+ param.add(paramName, String.class);
+ param.add(datesByParamName.get(paramName), Object.class);
+ rc.callMethod("setParameter", param);
+ }
+
+ ret.setMessagePanelInfoText("Temporal values were parameterized:\n" + jdbcTemporalEscapeParse.getMessagePanelInfoText());
+ }
+ else
+ {
+ rc = getRcHibernateSession().callMethod("createQuery", hqlQuery);
+ }
+
+
if (isDataUpdate(hqlQuery))
{
int updateCount = (Integer)rc.callMethod("executeUpdate").getCallee();
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java 2012-03-06 21:57:56 UTC (rev 6598)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java 2012-03-12 21:35:28 UTC (rev 6599)
@@ -11,6 +11,7 @@
private HashMap<String, Throwable> _sessionAdminExceptions = new HashMap<String, Throwable>();
private Integer _updateCount;
+ private String _messagePanelInfoText;
public void putSessionAdminException(String msgKey, Throwable t)
{
@@ -51,4 +52,14 @@
{
return _updateCount;
}
+
+ public void setMessagePanelInfoText(String messagePanelInfoText)
+ {
+ _messagePanelInfoText = messagePanelInfoText;
+ }
+
+ public String getMessagePanelInfoText()
+ {
+ return _messagePanelInfoText;
+ }
}
Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/JDBCTemporalEscapeParse.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/JDBCTemporalEscapeParse.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/JDBCTemporalEscapeParse.java 2012-03-12 21:35:28 UTC (rev 6599)
@@ -0,0 +1,237 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class JDBCTemporalEscapeParse
+{
+
+ private String _hql;
+ private TreeMap<String, Date> _datesByParamName = new TreeMap<String, Date>();
+ private TemporalData[] _temporalDatas = new TemporalData[]{new TimeStampData(), new DateData(), new TimeData()};
+
+
+ public JDBCTemporalEscapeParse(String hql)
+ {
+ _hql = hql;
+
+ for (TemporalData temporalData : _temporalDatas)
+ {
+ Matcher matcher = temporalData.getPattern().matcher(_hql);
+ int startIx = 0;
+
+ while(matcher.find(startIx))
+ {
+ if(isInLiteral(matcher.start(), _hql))
+ {
+ startIx = matcher.start() + 1;
+
+ if(startIx >= _hql.length())
+ {
+ break;
+ }
+ }
+ else
+ {
+ Date date = temporalData.valueOf(matcher.group(1));
+
+
+ String paramName = "p" + _datesByParamName.size();
+ _hql = _hql.substring(0, matcher.start()) + ":" + paramName + _hql.substring(matcher.end());
+
+ _datesByParamName.put(paramName, date);
+
+ matcher = temporalData.getPattern().matcher(_hql);
+ }
+ }
+ }
+ }
+
+ private static boolean isInLiteral(int pos, String str)
+ {
+
+ int countLiteralDelims = 0;
+ for (int i = 0; i < pos; i++)
+ {
+ if('\'' == str.charAt(i))
+ {
+ ++countLiteralDelims;
+ }
+ }
+
+ return 1 == countLiteralDelims % 2;
+ }
+
+ public String getMessagePanelInfoText()
+ {
+ String ret = " " + _hql;
+
+ for (String paramName : _datesByParamName.keySet())
+ {
+ ret += "\n " + paramName + "=" +_datesByParamName.get(paramName);
+ }
+
+ return ret;
+ }
+
+ public boolean hasEscapes()
+ {
+ return 0 < _datesByParamName.size();
+ }
+
+ private static interface TemporalData
+ {
+ Date valueOf(String hq1l);
+ Pattern getPattern();
+ }
+
+
+ private static class TimeStampData implements TemporalData
+ {
+
+ @Override
+ public Date valueOf(String str)
+ {
+ try
+ {
+ return Timestamp.valueOf(str);
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Could not interpret " + str + " as " + java.sql.Timestamp.class.getName(), e);
+ }
+ }
+
+ @Override
+ public Pattern getPattern()
+ {
+ return Pattern.compile("\\{ts\\s*'([0-9[:-][\\s][\\.]]+\\s*)'\\}");
+ }
+ }
+
+ private static class DateData implements TemporalData
+ {
+
+ @Override
+ public Date valueOf(String str)
+ {
+ try
+ {
+ return java.sql.Date.valueOf(str);
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Could not interpret " + str + " as " + java.sql.Date.class.getName(), e);
+ }
+ }
+
+ @Override
+ public Pattern getPattern()
+ {
+ return Pattern.compile("\\{d\\s*'([0-9[:-][\\s][\\.]]+\\s*)'\\}");
+ }
+ }
+
+ private static class TimeData implements TemporalData
+ {
+
+ @Override
+ public Date valueOf(String str)
+ {
+ try
+ {
+ return java.sql.Time.valueOf(str);
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Could not interpret " + str + " as " + java.sql.Time.class.getName(), e);
+ }
+ }
+
+ @Override
+ public Pattern getPattern()
+ {
+ return Pattern.compile("\\{t\\s*'([0-9[:-][\\s][\\.]]+\\s*)'\\}");
+ }
+ }
+
+
+ public String getHql()
+ {
+ return _hql;
+ }
+
+ public TreeMap<String, Date> getDatesByParamName()
+ {
+ return _datesByParamName;
+ }
+
+ public static void main(String[] args)
+ {
+ JDBCTemporalEscapeParse jep;
+
+ jep = new JDBCTemporalEscapeParse("dfd {ts '2012-03-08 19:52:21'} sdfdss d 'asdfs {t '20:29:34'}' select {d '2012-03-08'} ");
+ System.out.println(jep.getHql());
+ for (Date date : jep.getDatesByParamName().values())
+ {
+ System.out.println(" date = " + date);
+ }
+
+ jep = new JDBCTemporalEscapeParse("'{t '20:29:34'}'");
+ System.out.println(jep.getHql());
+ for (Date date : jep.getDatesByParamName().values())
+ {
+ System.out.println(" date = " + date);
+ }
+
+ jep = new JDBCTemporalEscapeParse("{t '20:29:34'}");
+ System.out.println(jep.getHql());
+ for (Date date : jep.getDatesByParamName().values())
+ {
+ System.out.println(" date = " + date);
+ }
+
+ jep = new JDBCTemporalEscapeParse("'{t '20:29:34'}'{t '20:29:34'}");
+ System.out.println(jep.getHql());
+ for (Date date : jep.getDatesByParamName().values())
+ {
+ System.out.println(" date = " + date);
+ }
+
+ jep = new JDBCTemporalEscapeParse("{t '20:29:34'}'{t '20:29:34'}'");
+ System.out.println(jep.getHql());
+ for (Date date : jep.getDatesByParamName().values())
+ {
+ System.out.println(" date = " + date);
+ }
+
+ jep = new JDBCTemporalEscapeParse("dfd {ts '2012-03-08 19:52:21'} sdfdss d 'asdfs {t '20:29:34'}' select {t '20:29:34'} {d '2012-03-08'} ");
+ System.out.println(jep.getHql());
+ for (Date date : jep.getDatesByParamName().values())
+ {
+ System.out.println(" date = " + date);
+ }
+
+ jep = new JDBCTemporalEscapeParse("dfd {ts '2012-03-08 19:52:21'} sdfdss d 'asdfs ' select {t '20:29:34'} {d '2012-03-08'} ");
+ System.out.println(jep.getHql());
+ for (Date date : jep.getDatesByParamName().values())
+ {
+ System.out.println(" date = " + date);
+ }
+
+ jep = new JDBCTemporalEscapeParse("dfd sdfdss d 'asdfs {t '20:29:34'} ' select ");
+ System.out.println(">" + jep.getHql() + "<");
+ for (Date date : jep.getDatesByParamName().values())
+ {
+ System.out.println(" date = " + date);
+ }
+
+
+
+ }
+
+
+}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java 2012-03-06 21:57:56 UTC (rev 6598)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java 2012-03-12 21:35:28 UTC (rev 6599)
@@ -85,6 +85,12 @@
return;
}
+ if(null != _hqlQueryResult.getMessagePanelInfoText())
+ {
+ _session.getApplication().getMessageHandler().showMessage(_hqlQueryResult.getMessagePanelInfoText());
+ }
+
+
if (null == _hqlQueryResult.getQueryResultList())
{
if (null != _hqlQueryResult.getUpdateCount())
Modified: trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties 2012-03-06 21:57:56 UTC (rev 6598)
+++ trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties 2012-03-12 21:35:28 UTC (rev 6599)
@@ -66,3 +66,7 @@
HibernateSQLPanel.UseConnectionOf.Session=This Session
HibernateSQLPanel.UseConnectionOf=Use connection of:
+
+HQLEntryPanelManager.escapeDate=Escape date
+
+EditExtrasAccessor.editextrasPluginNeededForEscapeDate=Escape date is only available with the Edit Extras Plugin.\nGet the plugin from www.squirrelsql.org. It's free.
\ 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: <ger...@us...> - 2012-03-06 21:58:03
|
Revision: 6598
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6598&view=rev
Author: gerdwagner
Date: 2012-03-06 21:57:56 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Hibernate Plugin:
- Support of hql results that return plain values instead of mapped objects. Mixes of plain values mapped objects are supported, too.
- Support of data changing hql statements.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/MappedClassInfoData.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstitute.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteRoot.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/RootType.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ViewObjectsUtil.java
trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PlainValue.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-03-06 21:57:56 UTC (rev 6598)
@@ -9,6 +9,11 @@
Enhancements:
+Hibernate Plugin:
+ - Support of hql results that return plain values instead of mapped objects. Mixes of plain values mapped objects are supported, too.
+ - Support of data changing hql statements.
+
+
DBCopy Plugin:
- Offers a new menu item "Paste table as ..." that allows to change the pasted table's name.
This function works if only a single table was copied.
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedClassInfo.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -211,4 +211,8 @@
}
+ public boolean isPlainValueArray()
+ {
+ return _mappedClassInfoData.isPlainValueArray();
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -245,12 +245,21 @@
{
ReflectionCaller rc = getRcHibernateSession().callMethod("createQuery", hqlQuery);
- if (0 <= sqlNbrRowsToShow)
+ if (isDataUpdate(hqlQuery))
{
- rc = rc.callMethod("setMaxResults", new RCParam().add(sqlNbrRowsToShow, Integer.TYPE));
+ int updateCount = (Integer)rc.callMethod("executeUpdate").getCallee();
+ ret.setUpdateCount(updateCount);
+ getRcHibernateSession().callMethod("getTransaction").callMethod("commit");
}
+ else
+ {
+ if (0 <= sqlNbrRowsToShow)
+ {
+ rc = rc.callMethod("setMaxResults", new RCParam().add(sqlNbrRowsToShow, Integer.TYPE));
+ }
- queryResList = (List) rc.callMethod("list").getCallee();
+ queryResList = (List) rc.callMethod("list").getCallee();
+ }
}
catch (Throwable t)
{
@@ -284,6 +293,16 @@
return ret;
}
+ private boolean isDataUpdate(String hqlQuery)
+ {
+ return null != hqlQuery
+ && (
+ hqlQuery.trim().toLowerCase().startsWith("insert")
+ || hqlQuery.trim().toLowerCase().startsWith("update")
+ || hqlQuery.trim().toLowerCase().startsWith("delete")
+ );
+ }
+
private Throwable prepareTransport(Throwable t)
{
if(false == _server)
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -10,6 +10,7 @@
private Throwable _exceptionOccuredWhenExecutingQuery;
private HashMap<String, Throwable> _sessionAdminExceptions = new HashMap<String, Throwable>();
+ private Integer _updateCount;
public void putSessionAdminException(String msgKey, Throwable t)
{
@@ -40,4 +41,14 @@
{
return _sessionAdminExceptions;
}
+
+ public void setUpdateCount(int updateCount)
+ {
+ _updateCount = updateCount;
+ }
+
+ public Integer getUpdateCount()
+ {
+ return _updateCount;
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/MappedClassInfoData.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/MappedClassInfoData.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/MappedClassInfoData.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -9,6 +9,7 @@
private String _simpleMappedClassName;
private HibernatePropertyInfo _indentifierHibernatePropertyInfo;
private HibernatePropertyInfo[] _hibernatePropertyInfos;
+ private boolean _plainValueArray;
public MappedClassInfoData(String mappedClassName, String tableName, HibernatePropertyInfo indentifierHibernatePropertyInfo, HibernatePropertyInfo[] hibernatePropertyInfos)
{
@@ -70,4 +71,13 @@
return cpTokens[cpTokens.length - 1];
}
+ public boolean isPlainValueArray()
+ {
+ return _plainValueArray;
+ }
+
+ public void setPlainValueArray(boolean plainValueArray)
+ {
+ _plainValueArray = plainValueArray;
+ }
}
\ No newline at end of file
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstitute.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstitute.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstitute.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -1,7 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.server;
import java.io.Serializable;
-import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -12,6 +11,11 @@
private MappedClassInfoData _mappedClassInfoData;
private String _toString;
+
+ public static final String PLAIN_VALUES = "<plain values>";
+ private ArrayList<Object> _plainValueArray;
+ private HashMap<String, PlainValue> _plainValueByPropertyName = new HashMap<String, PlainValue>();
+
/**
* Is seriously meant to be package visible because it must not called nowhere except during initialzation in ObjectSubstituteFactory
*/
@@ -21,9 +25,43 @@
_toString = toString;
}
+ ObjectSubstitute(ArrayList<Object> plainValueArray)
+ {
+ _plainValueArray = plainValueArray;
+ _toString = PLAIN_VALUES + "[" + plainValueArray.size() + "]";
+
+
+ String className = null == plainValueArray.get(0) ? "<unknown>" : plainValueArray.get(0).getClass().getName();
+ String propertyName = "value " + (1);
+ HibernatePropertyInfo indentifierHibernatePropertyInfo = new HibernatePropertyInfo(propertyName, className, "<unknown>", new String[]{"<unknown>"});
+
+ _plainValueByPropertyName.put(propertyName, new PlainValue(plainValueArray.get(0), indentifierHibernatePropertyInfo));
+
+ HibernatePropertyInfo[] hibernatePropertyInfos = new HibernatePropertyInfo[plainValueArray.size() - 1];
+ for (int i = 1; i < plainValueArray.size(); i++)
+ {
+ className = null == plainValueArray.get(i) ? "<unknown>" : plainValueArray.get(i).getClass().getName();
+ propertyName = "value " + (i + 1);
+ hibernatePropertyInfos[i-1] = new HibernatePropertyInfo(propertyName, className, "<unknown>", new String[]{"<unknown>"});
+
+ _plainValueByPropertyName.put(propertyName, new PlainValue(plainValueArray.get(i), hibernatePropertyInfos[i-1]));
+ }
+
+
+ _mappedClassInfoData = new MappedClassInfoData(PLAIN_VALUES, "<unknown>", indentifierHibernatePropertyInfo, hibernatePropertyInfos);
+ _mappedClassInfoData.setPlainValueArray(true);
+ }
+
void putSubstituteValueByPropertyName(String propertyName, PropertySubstitute propertySubstitute)
{
- _substituteValueByPropertyName.put(propertyName, propertySubstitute);
+ if (null == _plainValueArray)
+ {
+ _substituteValueByPropertyName.put(propertyName, propertySubstitute);
+ }
+ else
+ {
+ throw new IllegalStateException("Should not be called for plain values");
+ }
}
public String getClassName()
@@ -36,17 +74,38 @@
*/
public Object getValue(String propertyName)
{
- return _substituteValueByPropertyName.get(propertyName).getSingleValue();
+ if (null == _plainValueArray)
+ {
+ return _substituteValueByPropertyName.get(propertyName).getSingleValue();
+ }
+ else
+ {
+ return _plainValueByPropertyName.get(propertyName).getValue();
+ }
}
public String getTypeName(String propertyName)
{
- return _substituteValueByPropertyName.get(propertyName).getHibernatePropertyInfo().getClassName();
+ if (null == _plainValueArray)
+ {
+ return _substituteValueByPropertyName.get(propertyName).getHibernatePropertyInfo().getClassName();
+ }
+ else
+ {
+ return _plainValueByPropertyName.get(propertyName).getHibernatePropertyInfo().getClassName();
+ }
}
public boolean wasInitialized(String propertyName)
{
- return _substituteValueByPropertyName.get(propertyName).isInitialized();
+ if (null == _plainValueArray)
+ {
+ return _substituteValueByPropertyName.get(propertyName).isInitialized();
+ }
+ else
+ {
+ return true;
+ }
}
public Collection<? extends ObjectSubstitute> getPersistentCollection(String propertyName)
@@ -56,17 +115,38 @@
public boolean isPersistenCollection(String propertyName)
{
- return _substituteValueByPropertyName.get(propertyName).isPersistenCollection();
+ if (null == _plainValueArray)
+ {
+ return _substituteValueByPropertyName.get(propertyName).isPersistenCollection();
+ }
+ else
+ {
+ return false;
+ }
}
public boolean isNull(String propertyName)
{
- return _substituteValueByPropertyName.get(propertyName).isNull(); //To change body of created methods use File | Settings | File Templates.
+ if (null == _plainValueArray)
+ {
+ return _substituteValueByPropertyName.get(propertyName).isNull();
+ }
+ else
+ {
+ return null == _plainValueByPropertyName.get(propertyName).getValue();
+ }
}
public HibernatePropertyInfo getHibernatePropertyInfo(String propertyName)
{
- return _substituteValueByPropertyName.get(propertyName).getHibernatePropertyInfo();
+ if (null == _plainValueArray)
+ {
+ return _substituteValueByPropertyName.get(propertyName).getHibernatePropertyInfo();
+ }
+ else
+ {
+ return _plainValueByPropertyName.get(propertyName).getHibernatePropertyInfo();
+ }
}
@Override
@@ -74,4 +154,16 @@
{
return _toString;
}
+
+ public MappedClassInfoData getPlainValueArrayMappedClassInfo()
+ {
+ if (null == _plainValueArray)
+ {
+ return null;
+ }
+ else
+ {
+ return _mappedClassInfoData;
+ }
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -41,16 +41,52 @@
if(o instanceof Object[])
{
ArrayList<ObjectSubstitute> arrBuf = new ArrayList<ObjectSubstitute>();
+ ArrayList<Object> plainValueArrBuf = new ArrayList<Object>();
Object[] arr = (Object[]) o;
for (Object entry : arr)
{
- arrBuf.add(_prepareObjectSubstitute(entry, infoDataByClassName, null ,doneObjs));
+ if(isMappedObject(entry, infoDataByClassName))
+ {
+ arrBuf.add(_prepareObjectSubstitute(entry, infoDataByClassName, null ,doneObjs));
+ }
+ else
+ {
+ plainValueArrBuf.add(entry);
+ }
}
- buf = new ObjectSubstituteRoot(arrBuf);
+
+ if(0 < plainValueArrBuf.size())
+ {
+ if (0 < arrBuf.size())
+ {
+ // result row is a mixture of plain values and mapped objects
+ arrBuf.add(new ObjectSubstitute(plainValueArrBuf));
+ buf = new ObjectSubstituteRoot(arrBuf);
+ }
+ else
+ {
+ // result row consists only of plain values
+ buf = new ObjectSubstituteRoot(new ObjectSubstitute(plainValueArrBuf));
+ }
+ }
+ else
+ {
+ // result row consists only of mapped objects
+ buf = new ObjectSubstituteRoot(arrBuf);
+ }
}
else
{
- buf = new ObjectSubstituteRoot(_prepareObjectSubstitute(o, infoDataByClassName, null,doneObjs));
+ if(isMappedObject(o, infoDataByClassName))
+ {
+ buf = new ObjectSubstituteRoot(_prepareObjectSubstitute(o, infoDataByClassName, null,doneObjs));
+ }
+ else
+ {
+ ArrayList<Object> plainValueArrBuf = new ArrayList<Object>();
+ plainValueArrBuf.add(o);
+ buf = new ObjectSubstituteRoot(new ObjectSubstitute(plainValueArrBuf));
+ }
}
ret.add(buf);
@@ -64,6 +100,11 @@
}
+ private boolean isMappedObject(Object entry, HashMap<String, MappedClassInfoData> infoDataByClassName)
+ {
+ return null != findMappedClassInfoData(entry, infoDataByClassName, null);
+ }
+
private ArrayList<ObjectSubstitute> _prepareObjectSubstitutesForCollection(Collection col, HashMap<String, MappedClassInfoData> infoDataByClassName, HashMap<Object, ObjectSubstitute> doneObjs)
{
try
@@ -158,12 +199,13 @@
private MappedClassInfoData findMappedClassInfoData(Object o, HashMap<String, MappedClassInfoData> infoDataByClassName, MappedClassInfoData infoDataFromProperty)
{
- MappedClassInfoData mappedClassInfoData;
+ MappedClassInfoData mappedClassInfoData = null;
+
if (null != infoDataFromProperty)
{
mappedClassInfoData = infoDataFromProperty;
}
- else
+ else if(null != o)
{
mappedClassInfoData = infoDataByClassName.get(o.getClass().getName());
@@ -178,10 +220,10 @@
}
}
- if(null == mappedClassInfoData)
- {
- throw new IllegalStateException("Could not find mapping infos for class: " + o.getClass().getName());
- }
+// if(null == mappedClassInfoData)
+// {
+// throw new IllegalStateException("Could not find mapping infos for class: " + o.getClass().getName());
+// }
return mappedClassInfoData;
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteRoot.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteRoot.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteRoot.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -55,4 +55,26 @@
return ret;
}
+
+ public MappedClassInfoData getPlainValueArrayMappedClassInfo()
+ {
+ if(isArray())
+ {
+ for (ObjectSubstitute objectSubstitute : _objectSubstituteArray)
+ {
+ if(null != objectSubstitute.getPlainValueArrayMappedClassInfo())
+ {
+ // There can be just one PlainValueArray in a tuple
+ return objectSubstitute.getPlainValueArrayMappedClassInfo();
+ }
+ }
+
+ return null;
+
+ }
+ else
+ {
+ return _objectSubstitute.getPlainValueArrayMappedClassInfo();
+ }
+ }
}
Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PlainValue.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PlainValue.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/PlainValue.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -0,0 +1,25 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.io.Serializable;
+
+public class PlainValue implements Serializable
+{
+ private Object _value;
+ private HibernatePropertyInfo _hibernatePropertyInfo;
+
+ public PlainValue(Object value, HibernatePropertyInfo hibernatePropertyInfo)
+ {
+ _value = value;
+ _hibernatePropertyInfo = hibernatePropertyInfo;
+ }
+
+ public Object getValue()
+ {
+ return _value;
+ }
+
+ public HibernatePropertyInfo getHibernatePropertyInfo()
+ {
+ return _hibernatePropertyInfo;
+ }
+}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -6,6 +6,7 @@
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernateConnection;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.MappedClassInfoData;
import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstitute;
import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstituteRoot;
import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateSQLUtil;
@@ -71,11 +72,19 @@
ArrayList<MappedClassInfo> mappedClassInfos = con.getMappedClassInfos();
+
+ MappedClassInfo plainValueArrayMappedClassInfo = getBestPlainValueArrayMappedClassInfo(objects);
+ if(null != plainValueArrayMappedClassInfo)
+ {
+ mappedClassInfos = (ArrayList<MappedClassInfo>) mappedClassInfos.clone();
+ mappedClassInfos.add(plainValueArrayMappedClassInfo);
+ }
+
_resultsController = new ResultsController(_tab.pnlResults, hqlQuery, mappedClassInfos, session);
- RootType qrmr = new RootType(objects, con.getMappedClassInfos());
+ RootType qrmr = new RootType(objects, mappedClassInfos);
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(qrmr);
_tab.treeTypes.setModel(new DefaultTreeModel(rootNode));
@@ -106,6 +115,19 @@
//CommandLineOutput.displayObjects(mappedClassInfos, qrmr, con.getPersistenCollectionClass());
}
+ private MappedClassInfo getBestPlainValueArrayMappedClassInfo(List<ObjectSubstituteRoot> objects)
+ {
+ // Can be improved: If first array element contains nulls the type of these values will be unknown
+ // though it might be available in other array elements.
+ MappedClassInfoData plainValueArrayMappedClassInfo = objects.get(0).getPlainValueArrayMappedClassInfo();
+
+ if(null == plainValueArrayMappedClassInfo)
+ {
+ return null;
+ }
+ return new MappedClassInfo(plainValueArrayMappedClassInfo);
+ }
+
private void onCopySqlToClip(HibernateConnection con, String hqlQuery, ISession session)
{
ArrayList<String> sqls = con.generateSQL(hqlQuery);
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -87,7 +87,14 @@
if (null == _hqlQueryResult.getQueryResultList())
{
- s_log.error(new NullPointerException("HqlQueryResult didn't contain a resultlist although it should according to its error state."));
+ if (null != _hqlQueryResult.getUpdateCount())
+ {
+ _session.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("ObjectResultController.hqlDataUpdateSuccess", _hqlQueryResult.getUpdateCount(), _duration));
+ }
+ else
+ {
+ s_log.error(new NullPointerException("HqlQueryResult didn't contain a resultlist although it should according to its error state."));
+ }
}
else
{
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -84,7 +84,7 @@
}
- if (null != mappedClassInfo)
+ if (null != mappedClassInfo && false == mappedClassInfo.isPlainValueArray())
{
return new SingleResult((ObjectSubstitute)hpr.getValue(), mappedClassInfo);
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/RootType.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/RootType.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/RootType.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -23,15 +23,7 @@
{
if(object.isArray())
{
- ArrayList<String> mappedClassNames = new ArrayList<String>();
- for(int i=0; i < object.getArraySize(); ++i)
- {
- ObjectSubstitute buf = object.getArrayItemAt(i);
- String mappedClassName = buf.getClassName();
- mappedClassNames.add(mappedClassName);
- }
-
- return createResultTupelType(mappedClassNames, allMappedClassInfos, objects);
+ return createResultTupleType(object, allMappedClassInfos, objects);
}
else
{
@@ -41,26 +33,28 @@
}
}
- private SingleType createSingleTypeResultType(String mappedClassName, ArrayList<MappedClassInfo> allMappedClassInfos, List<ObjectSubstituteRoot> objects)
+ private IType createResultTupleType(ObjectSubstituteRoot object, ArrayList<MappedClassInfo> allMappedClassInfos, List<ObjectSubstituteRoot> objects)
{
- MappedClassInfo mappedClassInfo = ViewObjectsUtil.findMappedClassInfo(mappedClassName, allMappedClassInfos, false);
-
- return new SingleType(mappedClassInfo, allMappedClassInfos, ObjectSubstituteRoot.toObjectSubstitutes(objects));
- }
-
- private TupelType createResultTupelType(ArrayList<String> mappedClassNames, ArrayList<MappedClassInfo> allMappedClassInfos, List<ObjectSubstituteRoot> objects)
- {
-
ArrayList<MappedClassInfo> mappedClassInfos = new ArrayList<MappedClassInfo>();
- for (String mappedClassName : mappedClassNames)
+
+ for(int i=0; i < object.getArraySize(); ++i)
{
+ ObjectSubstitute buf = object.getArrayItemAt(i);
+ String mappedClassName = buf.getClassName();
mappedClassInfos.add(ViewObjectsUtil.findMappedClassInfo(mappedClassName, allMappedClassInfos, false));
}
return new TupelType(mappedClassInfos, allMappedClassInfos, objects);
}
+ private SingleType createSingleTypeResultType(String mappedClassName, ArrayList<MappedClassInfo> allMappedClassInfos, List<ObjectSubstituteRoot> objects)
+ {
+ MappedClassInfo mappedClassInfo = ViewObjectsUtil.findMappedClassInfo(mappedClassName, allMappedClassInfos, false);
+ return new SingleType(mappedClassInfo, allMappedClassInfos, ObjectSubstituteRoot.toObjectSubstitutes(objects));
+ }
+
+
public IType getResultType()
{
return _type;
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -99,7 +99,10 @@
mci = ViewObjectsUtil.findMappedClassInfo(hpr.getTypeName(), _allMappedClassInfos, false);
}
- objects.add((ObjectSubstitute) hpr.getValue());
+ if (null != mci && false == mci.isPlainValueArray())
+ {
+ objects.add((ObjectSubstitute) hpr.getValue());
+ }
}
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ViewObjectsUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ViewObjectsUtil.java 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ViewObjectsUtil.java 2012-03-06 21:57:56 UTC (rev 6598)
@@ -44,7 +44,7 @@
{
parent.add(new DefaultMutableTreeNode(new PersistentCollectionResult(hpr, propertyInfo, allMappedClassInfos)));
}
- else if (null != findMappedClassInfo(hpr.getTypeName(), allMappedClassInfos, true))
+ else if (isMappedType(allMappedClassInfos, hpr))
{
SingleResult buf = new SingleResult(propertyName, (ObjectSubstitute) hpr.getValue(), findMappedClassInfo(hpr.getTypeName(), allMappedClassInfos, false));
parent.add(new DefaultMutableTreeNode(buf));
@@ -56,6 +56,12 @@
}
}
+ private static boolean isMappedType(ArrayList<MappedClassInfo> allMappedClassInfos, HibernatePropertyReader hpr)
+ {
+ MappedClassInfo mappedClassInfo = findMappedClassInfo(hpr.getTypeName(), allMappedClassInfos, true);
+ return null != mappedClassInfo && false == mappedClassInfo.isPlainValueArray();
+ }
+
static void nodeStructurChanged(DefaultMutableTreeNode node, JTree tree)
{
((DefaultTreeModel) tree.getModel()).nodeStructureChanged(node);
Modified: trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties 2012-03-04 11:44:35 UTC (rev 6597)
+++ trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties 2012-03-06 21:57:56 UTC (rev 6598)
@@ -2,6 +2,7 @@
ObjectResultTabController.queryInfoLimited=LIMITED count:{0}; {1}
ObjectResultController.hqlReadObjectsSuccess=Read {0} objects in {1} milliseconds
+ObjectResultController.hqlDataUpdateSuccess=Updated {0} objects in {1} milliseconds
QueryResultNode.objectTree=Object tree
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-03-04 11:44:42
|
Revision: 6597
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6597&view=rev
Author: gerdwagner
Date: 2012-03-04 11:44:35 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
Bug fix: Query for non queries statistics were not written to message panel. The problem was introduced lately by revision 6579 (Swing Dispatch thread fix)
Revision Links:
--------------
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6579&view=rev
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
Removed Paths:
-------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java 2012-03-04 11:44:35 UTC (rev 6597)
@@ -46,48 +46,9 @@
/** Number of rows query limited to. */
private final int _maxRows;
private Integer _numberResultRowsRead;
- private SQLExecutionInfoFinishedListener _sqlExecutionInfoFinishedListener;
- /**
- * Default ctor. Defaults SQL execution start time to the current time.
- */
-// public SQLExecutionInfo()
-// {
-// this(1, "");
-// }
- /**
- * ctor specifying the query index. Defaults SQL execution start time to
- * the current time.
- *
- * @param idx Query index.
- */
-// public SQLExecutionInfo(int idx)
-// {
-// this(idx, "");
-// }
-
- /**
- * ctor specifying the SQL being executed. Defaults SQL execution start time
- * to the current time.
- *
- * @param sql SQL being executed.
- *
- * @throws IllegalArgumentException
- * Thrown if <TT>null</TT> sql passed.
- */
-// public SQLExecutionInfo(String sql)
-// {
-// super();
-// if (sql == null)
-// {
-// throw new IllegalArgumentException("SQL script == null");
-// }
-// _sql = sql;
-// _sqlExecutionStart = Calendar.getInstance().getTime();
-// }
-
- /**
+ /**
* ctor specifying the SQL being executed and the query index. Defaults SQL
* execution start time to the current time.
*
@@ -119,30 +80,8 @@
_resultsProcessingStart = Calendar.getInstance().getTime();
}
- /**
- * Flag that the results processing is complete.
- */
- public void resultsProcessingComplete()
- {
- _resultsProcessingEnd = Calendar.getInstance().getTime();
- if(null != _sqlExecutionInfoFinishedListener)
- {
- _sqlExecutionInfoFinishedListener.allProcessingComplete(this);
- }
- }
-
- /**
- * Retrieve the query index.
- *
- * @return Query index.
- */
- public int getQueryIndex()
- {
- return _idx;
- }
-
- /**
+ /**
* Retrieve the SQL script executed.
*
* @return SQL script executed.
@@ -162,24 +101,7 @@
return _sqlExecutionStart;
}
- /**
- * Set the SQL Execution start time.
- *
- * @param value SQL execution start time.
- *
- * @throws IllegalArgumentException
- * Thrown if <TT>null</TT> <TT>Date</TT> passed.
- */
- public void setSQLExecutionStartTime(Date value)
- {
- if (value == null)
- {
- throw new IllegalArgumentException("SQL Execution start time == null");
- }
- _sqlExecutionStart = value;
- }
-
- /**
+ /**
* Retrieve the elapsed time time in milliseconds for the SQL execution.
*
* @return SQL execution elapsed time in millis.
@@ -229,8 +151,9 @@
return _maxRows;
}
- public void setNumberResultRowsRead(int numberResultRowsRead)
+ public void resultsProcessingComplete(int numberResultRowsRead)
{
+ _resultsProcessingEnd = Calendar.getInstance().getTime();
_numberResultRowsRead = numberResultRowsRead;
}
@@ -238,9 +161,4 @@
{
return _numberResultRowsRead;
}
-
- public void setFinishedListener(SQLExecutionInfoFinishedListener sqlExecutionInfoFinishedListener)
- {
- _sqlExecutionInfoFinishedListener = sqlExecutionInfoFinishedListener;
- }
}
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java 2012-03-04 11:44:35 UTC (rev 6597)
@@ -1,6 +0,0 @@
-package net.sourceforge.squirrel_sql.client.session;
-
-public interface SQLExecutionInfoFinishedListener
-{
- void allProcessingComplete(SQLExecutionInfo sqlExecutionInfo);
-}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-03-04 11:44:35 UTC (rev 6597)
@@ -265,8 +265,6 @@
_metaDataOutput.show(mdds, null); // Why null??
}
- _exInfo.resultsProcessingComplete();
-
_queryInfoPanel.load(rowCount, _exInfo);
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2012-03-04 11:44:35 UTC (rev 6597)
@@ -246,18 +246,11 @@
}
else
{
- exInfo.setFinishedListener(new SQLExecutionInfoFinishedListener()
- {
- @Override
- public void allProcessingComplete(SQLExecutionInfo exInfo)
- {
- onAllProcessingComplete(exInfo, processedStatementCount, statementCount, numberResultRowsRead);
- }
- });
+ allProcessingComplete(exInfo, processedStatementCount, statementCount, numberResultRowsRead);
}
}
- private void onAllProcessingComplete(SQLExecutionInfo exInfo, int processedStatementCount, int statementCount, Integer numberResultRowsRead)
+ private void allProcessingComplete(SQLExecutionInfo exInfo, int processedStatementCount, int statementCount, Integer numberResultRowsRead)
{
double executionLength = ((double) exInfo.getSQLExecutionElapsedMillis()) / 1000;
double outputLength = ((double) exInfo.getResultsProcessingElapsedMillis()) / 1000;
@@ -408,7 +401,9 @@
DialectType dialectType =
DialectFactory.getDialectType(_session.getMetaData());
- info.setNumberResultRowsRead(rsds.setContentsTabResultSet(rs, null, dialectType));
+ // rsds.setContentsTabResultSet() reads the result set. So results processing on the DB is over
+ // and this time is measured. None is interested in the time that it takes us to render Swing tables ...
+ info.resultsProcessingComplete(rsds.setContentsTabResultSet(rs, null, dialectType));
_executionHandlerListener.addResultsTab(info, rsds, rsmdds, model, _resultTabToReplace);
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-03-04 11:44:35 UTC (rev 6597)
@@ -28,14 +28,14 @@
SQLResultExecuterPanel.nonStickyPanel=Cannot make a cancel or error tab sticky
SQLResultExecuterPanel.nosqlselected=No SQL selected for execution.
SQLResultExecuterPanel.outputStatus=Building output...
-SQLResultExecuterPanel.queryStatistics=Query {0} of {1}, Rows read: {2}, Elapsed time (seconds) - Total: {3}, SQL query: {4}, Building output: {5}
+SQLResultExecuterPanel.queryStatistics=Query {0} of {1}, Rows read: {2}, Elapsed time (seconds) - Total: {3}, SQL query: {4}, Reading results: {5}
SQLResultExecuterPanel.rowsDeleted={0} Row(s) Deleted
SQLResultExecuterPanel.rowsInserted={0} Row(s) Inserted
SQLResultExecuterPanel.rowsReturned={0} Row(s) Returned
SQLResultExecuterPanel.rowsSelected={0} Row(s) Selected
SQLResultExecuterPanel.rowsUpdated={0} Row(s) Updated
SQLResultExecuterPanel.scriptStmtCounts=Row update counts: {0} Inserts, {1} Selects, {2} Updates, {3} Deletes
-SQLResultExecuterPanel.scriptQueryStatistics=Executed {0} queries; elapsed time (seconds) - Total: {1}, SQL query: {2}, Building output: {3}
+SQLResultExecuterPanel.scriptQueryStatistics=Executed {0} queries; elapsed time (seconds) - Total: {1}, SQL query: {2}, Reading results: {3}
SQLResultExecuterPanel.sqlLabel=SQL:
SQLResultExecuterPanel.statusLabel=Status:
SQLResultExecuterPanel.title=Results
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-02-29 21:03:23
|
Revision: 6596
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6596&view=rev
Author: gerdwagner
Date: 2012-02-29 21:03:17 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Graph Plugin: Query Builder: Mixed up ASC and DESC in SQL generation and "order by" panel
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderCol.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderStructure.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryOrderTableModel.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-29 21:03:17 UTC (rev 6596)
@@ -53,6 +53,8 @@
Bug fixes:
+Graph Plugin: Query Builder: Mixed up ASC and DESC in SQL generation and "order by" panel
+
Hibernate Plugin: Fixed NullPointer that occurred in HQL execution concerning assisted but nonetheless initialized objects.
2947296 Table script creation for multiple tables fails (on OpenJDK)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java 2012-02-29 21:03:17 UTC (rev 6596)
@@ -112,6 +112,6 @@
public boolean isSortedAsc()
{
- return _sorting != Sorting.ASC;
+ return _sorting == Sorting.ASC;
}
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderCol.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderCol.java 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderCol.java 2012-02-29 21:03:17 UTC (rev 6596)
@@ -6,7 +6,7 @@
public class OrderCol implements SortedColumn
{
private String _qualifiedCol;
- private boolean _ascending;
+ private boolean _descending;
private boolean _aggregated;
@@ -20,7 +20,7 @@
public OrderCol(String simpleTableName, ColumnInfo columnInfo)
{
_qualifiedCol = simpleTableName + "." + columnInfo.getColumnName();
- _ascending = columnInfo.getQueryData().isSortedAsc();
+ _descending = false == columnInfo.getQueryData().isSortedAsc();
_aggregated = (AggregateFunctions.NONE != columnInfo.getQueryData().getAggregateFunction());
}
@@ -39,14 +39,14 @@
_qualifiedCol = qualifiedCol;
}
- public boolean isAscending()
+ public boolean isDescending()
{
- return _ascending;
+ return _descending;
}
- public void setAscending(boolean b)
+ public void setDescending(boolean b)
{
- _ascending = b;
+ _descending = b;
}
public boolean isAggregated()
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderStructure.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderStructure.java 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/OrderStructure.java 2012-02-29 21:03:17 UTC (rev 6596)
@@ -33,7 +33,7 @@
private String getOrderExpression(OrderCol orderCol, SelectClauseRes selectClause)
{
- String direction = orderCol.isAscending() ? " ASC" : "";
+ String direction = orderCol.isDescending() ? " DESC" : "";
if (orderCol.isAggregated())
{
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryOrderTableModel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryOrderTableModel.java 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryOrderTableModel.java 2012-02-29 21:03:17 UTC (rev 6596)
@@ -27,7 +27,7 @@
_colModel.addColumn(col);
col = new TableColumn(1);
- col.setHeaderValue(s_stringMgr.getString("graph.QueryOrderTableModel.Ascending"));
+ col.setHeaderValue(s_stringMgr.getString("graph.QueryOrderTableModel.Descending"));
final JCheckBox rendererCheckBox = new JCheckBox();
DefaultTableCellRenderer cellRenderer = new DefaultTableCellRenderer()
@@ -63,7 +63,7 @@
}
else
{
- return getSortedCol(row).isAscending();
+ return getSortedCol(row).isDescending();
}
}
@@ -83,7 +83,7 @@
protected void updateCol(OrderCol toBeUpdated, OrderCol update)
{
- toBeUpdated.setAscending(update.isAscending());
+ toBeUpdated.setDescending(update.isDescending());
toBeUpdated.setAggregated(update.isAggregated());
}
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties 2012-02-29 20:59:48 UTC (rev 6595)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties 2012-02-29 21:03:17 UTC (rev 6596)
@@ -43,7 +43,7 @@
graph.GraphQueryOrderPanel.moveDown=Down
graph.QueryOrderTableModel.Column=Column
-graph.QueryOrderTableModel.Ascending=Ascending
+graph.QueryOrderTableModel.Descending=Descending
graph.GraphQueryOrderPanel.orderLabel=To change the order in which columns appear in the ORDER BY clause mark columns and move them:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-02-29 20:59:55
|
Revision: 6595
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6595&view=rev
Author: gerdwagner
Date: 2012-02-29 20:59:48 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Hibernate Plugin: Fixed NullPointer that occurred in HQL execution concerning assisted but nonetheless initialized objects.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-28 22:06:58 UTC (rev 6594)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-29 20:59:48 UTC (rev 6595)
@@ -53,6 +53,8 @@
Bug fixes:
+Hibernate Plugin: Fixed NullPointer that occurred in HQL execution concerning assisted but nonetheless initialized objects.
+
2947296 Table script creation for multiple tables fails (on OpenJDK)
Graph Plugin: Opening Link dialog failed on Windows when one or more links already existed.
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java 2012-02-28 22:06:58 UTC (rev 6594)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ObjectSubstituteFactory.java 2012-02-29 20:59:48 UTC (rev 6595)
@@ -44,13 +44,13 @@
Object[] arr = (Object[]) o;
for (Object entry : arr)
{
- arrBuf.add(_prepareObjectSubstitute(entry, infoDataByClassName, doneObjs));
+ arrBuf.add(_prepareObjectSubstitute(entry, infoDataByClassName, null ,doneObjs));
}
buf = new ObjectSubstituteRoot(arrBuf);
}
else
{
- buf = new ObjectSubstituteRoot(_prepareObjectSubstitute(o, infoDataByClassName, doneObjs));
+ buf = new ObjectSubstituteRoot(_prepareObjectSubstitute(o, infoDataByClassName, null,doneObjs));
}
ret.add(buf);
@@ -74,7 +74,7 @@
{
for (Object o : col)
{
- ret.add(_prepareObjectSubstitute(o, infoDataByClassName, doneObjs));
+ ret.add(_prepareObjectSubstitute(o, infoDataByClassName, null, doneObjs));
}
}
return ret;
@@ -86,7 +86,7 @@
}
}
- private ObjectSubstitute _prepareObjectSubstitute(Object o, HashMap<String, MappedClassInfoData> infoDataByClassName, HashMap<Object, ObjectSubstitute> doneObjs) throws IllegalAccessException
+ private ObjectSubstitute _prepareObjectSubstitute(Object o, HashMap<String, MappedClassInfoData> infoDataByClassName, MappedClassInfoData infoDataFromProperty, HashMap<Object, ObjectSubstitute> doneObjs) throws IllegalAccessException
{
if (null == o)
{
@@ -99,7 +99,7 @@
return ret;
}
- MappedClassInfoData mappedClassInfoData = infoDataByClassName.get(o.getClass().getName());
+ MappedClassInfoData mappedClassInfoData = findMappedClassInfoData(o, infoDataByClassName, infoDataFromProperty);
ret = new ObjectSubstitute(mappedClassInfoData, o.toString());
doneObjs.put(o, ret);
@@ -127,7 +127,7 @@
{
if(isInitialized(accessor.get(o)))
{
- ObjectSubstitute objectSubstitute = _prepareObjectSubstitute(accessor.get(o), infoDataByClassName, doneObjs);
+ ObjectSubstitute objectSubstitute = _prepareObjectSubstitute(accessor.get(o), infoDataByClassName, propMappedClassInfoData,doneObjs);
PropertySubstitute propertySubstitute = new PropertySubstitute(hibernatePropertyInfo, objectSubstitute, true);
ret.putSubstituteValueByPropertyName(hibernatePropertyInfo.getPropertyName(), propertySubstitute);
}
@@ -153,37 +153,39 @@
}
}
-// Field[] declaredFields = o.getClass().getDeclaredFields();
-// for (Field declaredField : declaredFields)
-// {
-// if (infoDataByClassName.containsKey(declaredField.getType().getName()))
-// {
-// declaredField.setAccessible(true);
-// Object fielddObj = declaredField.get(o);
-// if (null != fielddObj)
-// {
-// if (-1 < fielddObj.getClass().getName().indexOf('$'))
-// {
-// ret.set(declaredField, null);
-// //declaredField.set(o, null);
-// }
-// else
-// {
-// ret.set(declaredField, _prepareObjectSubstitutes(fielddObj, infoDataByClassName, doneObjs));
-// }
-// }
-// }
-// else if (Collection.class.isAssignableFrom(declaredField.getType()))
-// {
-// declaredField.setAccessible(true);
-// Object fielddObj = declaredField.get(o);
-// ret.setList(declaredField, _prepareObjectSubstitutesForCollection((Collection) fielddObj, infoDataByClassName, doneObjs, false));
-// }
-// }
-
return ret;
}
+ private MappedClassInfoData findMappedClassInfoData(Object o, HashMap<String, MappedClassInfoData> infoDataByClassName, MappedClassInfoData infoDataFromProperty)
+ {
+ MappedClassInfoData mappedClassInfoData;
+ if (null != infoDataFromProperty)
+ {
+ mappedClassInfoData = infoDataFromProperty;
+ }
+ else
+ {
+ mappedClassInfoData = infoDataByClassName.get(o.getClass().getName());
+
+ if(null == mappedClassInfoData)
+ {
+ int javaAssisNamePartBegin = o.getClass().getName().indexOf("_$$_");
+ if (0 < javaAssisNamePartBegin)
+ {
+ String className = o.getClass().getName().substring(0, javaAssisNamePartBegin);
+ mappedClassInfoData = infoDataByClassName.get(className);
+ }
+ }
+ }
+
+ if(null == mappedClassInfoData)
+ {
+ throw new IllegalStateException("Could not find mapping infos for class: " + o.getClass().getName());
+ }
+
+ return mappedClassInfoData;
+ }
+
private Boolean isInitialized(Object obj)
{
return (Boolean) _rc.callStaticMethod(_cl, "org.hibernate.Hibernate", "isInitialized", new Class[]{Object.class}, new Object[]{obj}).getCallee();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-02-28 22:07:04
|
Revision: 6594
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6594&view=rev
Author: gerdwagner
Date: 2012-02-28 22:06:58 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
DBCopy Plugin:
- Offers a new menu item "Paste table as ..." that allows to change the pasted table's name.
This function works if only a single table was copied.
- Tables can now be pasted to arbitrary Schemas.
- In the Plugin preferences the user may choose to append copied data to exisitng tables
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-28 22:05:08 UTC (rev 6593)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-28 22:06:58 UTC (rev 6594)
@@ -13,7 +13,7 @@
- Offers a new menu item "Paste table as ..." that allows to change the pasted table's name.
This function works if only a single table was copied.
- Tables can now be pasted to arbitrary Schemas.
- - In the Plugin preferences the user may choose to append copied data to exisitng tables
+ - In the Plugin preferences the user may choose to append copied data to existing tables
Copy as INSERT-VALUES statement now works on almost any table not just on editable tables. If a table isn't in
a Session scope ";" is used as statement separator instead of the separator defined in Session properties.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-02-28 22:05:16
|
Revision: 6593
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6593&view=rev
Author: gerdwagner
Date: 2012-02-28 22:05:08 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
DBCopy Plugin:
- Offers a new menu item "Paste table as ..." that allows to change the pasted table's name.
This function works if only a single table was copied.
- Tables can now be pasted to arbitrary Schemas.
- In the Plugin preferences the user may choose to append copied data to exisitng tables
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyExecutor.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/SessionInfoProvider.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/UICallbacks.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/PreferencesPanel.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/prefs/DBCopyPreferenceBean.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/util/DBUtil.java
trunk/sql12/plugins/dbcopy/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbcopy/I18NStrings.properties
trunk/sql12/plugins/dbcopy/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/I18NStrings.properties
trunk/sql12/plugins/dbcopy/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbcopy/dbcopy.properties
trunk/sql12/plugins/dbcopy/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/I18NStrings.properties
trunk/sql12/plugins/dbcopy/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbcopy/images/copy.gif
trunk/sql12/plugins/dbcopy/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbcopy/images/paste.gif
Added Paths:
-----------
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableUtil.java
trunk/sql12/plugins/dbcopy/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbcopy/images/pasteas.gif
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/schemainfo/SchemaInfo.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -1649,4 +1649,9 @@
throw new RuntimeException(e);
}
}
+
+ public SQLDatabaseMetaData getSQLDatabaseMetaData()
+ {
+ return _dmd;
+ }
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-28 22:05:08 UTC (rev 6593)
@@ -9,6 +9,12 @@
Enhancements:
+DBCopy Plugin:
+ - Offers a new menu item "Paste table as ..." that allows to change the pasted table's name.
+ This function works if only a single table was copied.
+ - Tables can now be pasted to arbitrary Schemas.
+ - In the Plugin preferences the user may choose to append copied data to exisitng tables
+
Copy as INSERT-VALUES statement now works on almost any table not just on editable tables. If a table isn't in
a Session scope ";" is used as statement separator instead of the separator defined in Session properties.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -1875,7 +1875,7 @@
final List<String> constraints = createConstraints(ti, tables, prefs, md);
addConstraintsSQLs(sqls, allconstraints, constraints, prefs);
- final List<String> indexes = createIndexes(ti, md, pkInfos, prefs);
+ final List<String> indexes = createIndexes(ti, ti.getSimpleName(), ti.getSchemaName(), md, pkInfos, prefs);
addConstraintsSQLs(sqls, allconstraints, indexes, prefs);
}
@@ -2441,8 +2441,8 @@
* @param prefs
* @return
*/
- public static List<String> createIndexes(ITableInfo ti, ISQLDatabaseMetaData md,
- List<PrimaryKeyInfo> primaryKeys, CreateScriptPreferences prefs)
+ public static List<String> createIndexes(ITableInfo ti, String destSimpleTableName, String destSchema, ISQLDatabaseMetaData md,
+ List<PrimaryKeyInfo> primaryKeys, CreateScriptPreferences prefs)
{
if (ti == null) { throw new IllegalArgumentException("ti cannot be null"); }
if (md == null) { throw new IllegalArgumentException("md cannot be null"); }
@@ -2527,7 +2527,7 @@
indexSQL.append(ix.ixName);
indexSQL.append(" ON ");
- indexSQL.append(formatQualifIntern(ix.table, ix.tableSchema, prefs));
+ indexSQL.append(formatQualifIntern(destSimpleTableName, destSchema, prefs));
if (ix.cols.size() == 1)
{
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyExecutor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyExecutor.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyExecutor.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -34,14 +34,7 @@
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.DialectUtils;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
-import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
-import net.sourceforge.squirrel_sql.fw.sql.PrimaryKeyInfo;
-import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
-import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
+import net.sourceforge.squirrel_sql.fw.sql.*;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.dbcopy.event.AnalysisEvent;
@@ -142,7 +135,7 @@
}
/**
- * Performs the table copy operation.
+ * Performs the table copy operation.
*/
private void _execute() {
start = System.currentTimeMillis();
@@ -155,36 +148,41 @@
List<IDatabaseObjectInfo> sourceObjs = prov.getSourceDatabaseObjects();
int[] counts = getTableCounts();
sendCopyStarted(counts);
- String destSchema = prov.getDestDatabaseObject().getSimpleName();
- String destCatalog = prov.getDestDatabaseObject().getCatalogName();
-
- int sourceObjectCount = 0;
+
+ //String destSchema = prov.getDestDatabaseObject().getSimpleName(); used to break, when a table was selected
+
+ String destSchema = DBUtil.getSchemaNameFromDbObject(prov.getDestDatabaseObject());
+
+ String destCatalog = prov.getDestDatabaseObject().getCatalogName();
+
+ TableInfo pasteToTableInfo = prov.getPasteToTableInfo(destConn, destSchema, destCatalog);
+
+ int sourceObjectCount = 0;
for (IDatabaseObjectInfo info : sourceObjs) {
if (! (info instanceof ITableInfo)) {
continue;
}
ITableInfo sourceTI = (ITableInfo)info;
- sendTableCopyStarted(sourceTI, sourceObjectCount+1);
+ sendTableCopyStarted(chooseDestTableInfo(sourceTI, pasteToTableInfo), sourceObjectCount+1);
try {
int destTableCount = DBUtil.getTableCount(destSession,
destCatalog,
- destSchema,
- sourceTI.getSimpleName(),
+ destSchema,
+ chooseDestTableInfo(sourceTI, pasteToTableInfo).getSimpleName(),
DialectFactory.DEST_TYPE);
if (destTableCount == -1) {
- createTable(sourceTI);
+ createTable(sourceTI, chooseDestTableInfo(sourceTI, pasteToTableInfo).getSimpleName(), destSchema, destCatalog);
}
if (destTableCount > 0) {
try {
- String t = sourceTI.getSimpleName();
- if (pref.appendRecordsToExisting(t)) {
+ if (pref.appendRecordsToExisting()) {
/* Do nothing */
- } else if (pref.deleteTableData(sourceTI.getSimpleName())) {
+ } else if (pref.deleteTableData(chooseDestTableInfo(sourceTI, pasteToTableInfo).getSimpleName())) {
// Yes || Yes to all
DBUtil.deleteDataInExistingTable(destSession,
destCatalog,
destSchema,
- sourceTI.getSimpleName());
+ chooseDestTableInfo(sourceTI, pasteToTableInfo).getSimpleName());
} else {
continue; // skip this table, try the next.
}
@@ -195,7 +193,7 @@
}
}
- copyTable(sourceTI, counts[sourceObjectCount]);
+ copyTable(sourceTI, pasteToTableInfo, counts[sourceObjectCount]);
if (sourceObjectCount == sourceObjs.size() - 1 && !cancelled) {
// We just copied the last table. Now it is safe to copy the
@@ -207,7 +205,7 @@
copyConstraints(sourceObjs);
}
if (!cancelled) {
- sendTableCopyFinished(sourceTI, sourceObjectCount+1);
+ sendTableCopyFinished(chooseDestTableInfo(sourceTI, pasteToTableInfo), sourceObjectCount+1);
sleep(prefs.getTableDelayMillis());
}
} catch (SQLException e) {
@@ -240,14 +238,26 @@
ISession session = prov.getDestSession();
if (session.getSessionSheet() != null) {
- session.getSchemaInfo().reload(prov.getDestDatabaseObject());
+ session.getSchemaInfo().reload(DBUtil.getSchemaFromDbObject(prov.getDestDatabaseObject(), session.getSchemaInfo()));
session.getSchemaInfo().fireSchemaInfoUpdate();
}
notifyCopyFinished();
}
-
- /**
+
+ private ITableInfo chooseDestTableInfo(ITableInfo sourceTI, TableInfo pasteToTableInfo)
+ {
+ if (null == pasteToTableInfo)
+ {
+ return sourceTI;
+ }
+ else
+ {
+ return pasteToTableInfo;
+ }
+ }
+
+ /**
* Registers the specified listener to receive copy events from this class.
*
* @param listener
@@ -287,7 +297,7 @@
* @return true if the tables can be created in the destination database;
* false is returned otherwise.
*/
- private boolean analyzeTables() {
+ private boolean analyzeTables() {
boolean result = true;
if (!prefs.isTestColumnNames()) {
return true;
@@ -516,12 +526,13 @@
/**
*
+ *
* @param sourceTableInfo
- * @param sourceTableCount
- * @throws MappingException
+ * @param pasteToTableInfo
+ *@param sourceTableCount @throws MappingException
* @throws SQLException
*/
- private void copyTable(ITableInfo sourceTableInfo, int sourceTableCount)
+ private void copyTable(ITableInfo sourceTableInfo, TableInfo pasteToTableInfo, int sourceTableCount)
throws MappingException, SQLException, UserCancelledOperationException
{
PreparedStatement insertStmt = null;
@@ -537,12 +548,12 @@
SQLDatabaseMetaData sourceMetaData = sourceConn.getSQLMetaData();
SQLDatabaseMetaData destMetaData = destConn.getSQLMetaData();
try {
- String destSchema =
- prov.getDestDatabaseObject().getSimpleName();
- ITableInfo destTableInfo =
+ String destSchema = DBUtil.getSchemaNameFromDbObject(prov.getDestDatabaseObject());
+
+ ITableInfo destTableInfo =
DBUtil.getTableInfo(prov.getDestSession(),
destSchema,
- sourceTableInfo.getSimpleName());
+ chooseDestTableInfo(sourceTableInfo, pasteToTableInfo).getSimpleName());
TableColumnInfo[] sourceInfos = sourceMetaData.getColumnInfo(sourceTableInfo);
TableColumnInfo[] destInfos = destMetaData.getColumnInfo(destTableInfo);
@@ -558,8 +569,8 @@
String selectSQL = DBUtil.getSelectQuery(prov,
sourceColList,
sourceTableInfo);
- String insertSQL = DBUtil.getInsertSQL(prov, destColList,
- sourceTableInfo,
+ String insertSQL = DBUtil.getInsertSQL(prov, destColList,
+ destTableInfo,
destInfos.length);
insertStmt = destConn.prepareStatement(insertSQL);
@@ -785,14 +796,14 @@
}
}
- private void createTable(ITableInfo ti)
+ private void createTable(ITableInfo ti, String destTableName, String destSchema, String destCatalog)
throws SQLException, UserCancelledOperationException, MappingException
{
if (cancelled) {
return;
}
ISQLConnection destCon = prov.getDestSession().getSQLConnection();
- String createTableSql = DBUtil.getCreateTableSql(prov, ti);
+ String createTableSql = DBUtil.getCreateTableSql(prov, ti, destTableName, destSchema, destCatalog);
if (log.isDebugEnabled()) {
log.debug("Creating table in dest db with SQL: "+createTableSql);
@@ -804,15 +815,18 @@
commitConnection(destCon);
}
- if (prefs.isCopyIndexDefs()) {
+ if (prefs.isCopyIndexDefs() && (null == prov.getPasteToTableName() || false == prov.isCopiedFormDestinationSession() ) ) {
Collection<String> indices = null;
ISQLDatabaseMetaData sqlmd = sourceSession.getMetaData();
- if (prefs.isCopyPrimaryKeys()) {
+ CreateScriptPreferences prefs = new CreateScriptPreferences();
+ prefs.setQualifyTableNames(null != destSchema);
+
+ if (this.prefs.isCopyPrimaryKeys()) {
PrimaryKeyInfo[] pkList = sqlmd.getPrimaryKey(ti);
List<PrimaryKeyInfo> pkList2 = Arrays.asList(pkList);
- indices = DialectUtils.createIndexes(ti, sqlmd, pkList2, new CreateScriptPreferences());
+ indices = DialectUtils.createIndexes(ti, destTableName, destSchema, sqlmd, pkList2, prefs);
} else {
- indices = DialectUtils.createIndexes(ti, sqlmd, null, new CreateScriptPreferences());
+ indices = DialectUtils.createIndexes(ti, destTableName, destSchema, sqlmd, null, prefs);
}
Iterator<String> i = indices.iterator();
while (i.hasNext()) {
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -42,6 +42,7 @@
import net.sourceforge.squirrel_sql.plugins.dbcopy.event.StatementEvent;
import net.sourceforge.squirrel_sql.plugins.dbcopy.event.TableEvent;
import net.sourceforge.squirrel_sql.plugins.dbcopy.gui.DualProgressBarDialog;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.prefs.PreferencesManager;
import net.sourceforge.squirrel_sql.plugins.dbcopy.util.DBUtil;
/**
@@ -147,16 +148,21 @@
* @see net.sourceforge.squirrel_sql.plugins.dbcopy.event.CopyTableListener#copyFinished(int)
*/
public void copyFinished(int seconds) {
- DualProgressBarDialog.stopTimer();
- DualProgressBarDialog.setVisible(false);
- DualProgressBarDialog.dispose();
+ closeProgress();
String title = getMessage("CopyProgressMonitor.successTitle");
String message = getMessage("CopyProgressMonitor.successMessage",
seconds);
showMessageDialog(message, title, JOptionPane.INFORMATION_MESSAGE);
}
- private String wordWrap(String data, int length) {
+ private void closeProgress()
+ {
+ DualProgressBarDialog.stopTimer();
+ DualProgressBarDialog.setVisible(false);
+ DualProgressBarDialog.dispose();
+ }
+
+ private String wordWrap(String data, int length) {
String result = "";
if (data.length() > length) {
String[] parts = data.split("\\s");
@@ -262,6 +268,7 @@
// let them fix it. Then allow them to retry the operation, starting
// from the point at which the previous operation failed.
+ closeProgress();
}
private String getMappingExceptionMessage(Exception e) {
@@ -437,10 +444,9 @@
return false;
}
- public boolean appendRecordsToExisting(String tableName) {
- // TODO: Maybe prompt the user to ask to append the records,
- // ignoring errors for constraint violations?
- return false;
+ public boolean appendRecordsToExisting() {
+
+ return PreferencesManager.getPreferences().isAppendRecordsToExisting();
}
class ConfirmMessageResult {
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/DBCopyPlugin.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -35,10 +35,13 @@
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+import net.sourceforge.squirrel_sql.fw.sql.TableInfo;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.dbcopy.actions.CopyTableAction;
import net.sourceforge.squirrel_sql.plugins.dbcopy.actions.PasteTableAction;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.actions.PasteTableAsAction;
import net.sourceforge.squirrel_sql.plugins.dbcopy.gui.DBCopyGlobalPreferencesTab;
import net.sourceforge.squirrel_sql.plugins.dbcopy.prefs.PreferencesManager;
@@ -63,8 +66,9 @@
private List<IDatabaseObjectInfo> selectedDatabaseObjects = null;
private IDatabaseObjectInfo selectedDestDatabaseObject = null;
+ private String _pasteToTableName;
- /**
+ /**
* @see net.sourceforge.squirrel_sql.client.plugin.ISessionPlugin#sessionStarted(net.sourceforge.squirrel_sql.client.session.ISession)
*/
public PluginSessionCallback sessionStarted(final ISession session)
@@ -175,11 +179,10 @@
IApplication app = getApplication();
ActionCollection coll = app.getActionCollection();
- PasteTableAction pasteTableAction = new PasteTableAction(app, _resources, this);
+ coll.add(new CopyTableAction(app, _resources, this));
+ coll.add(new PasteTableAction(app, _resources, this));
+ coll.add(new PasteTableAsAction(app, _resources, this));
- coll.add(new CopyTableAction(app, _resources, this));
- coll.add(pasteTableAction);
-
setPasteMenuEnabled(false);
}
@@ -291,19 +294,23 @@
api.addToPopup(DatabaseObjectType.TABLE_TYPE_DBO, coll.get(CopyTableAction.class));
api.addToPopup(DatabaseObjectType.TABLE_TYPE_DBO, coll.get(PasteTableAction.class));
+ api.addToPopup(DatabaseObjectType.TABLE_TYPE_DBO, coll.get(PasteTableAsAction.class));
// Copy action object tree types
api.addToPopup(DatabaseObjectType.TABLE, coll.get(CopyTableAction.class));
api.addToPopup(DatabaseObjectType.TABLE, coll.get(PasteTableAction.class));
+ api.addToPopup(DatabaseObjectType.TABLE, coll.get(PasteTableAsAction.class));
// Paste action object tree types
api.addToPopup(DatabaseObjectType.SCHEMA, coll.get(PasteTableAction.class));
+ api.addToPopup(DatabaseObjectType.SCHEMA, coll.get(PasteTableAsAction.class));
// MySQL shows databases as "CATALOGS" not "SCHEMAS"
api.addToPopup(DatabaseObjectType.CATALOG, coll.get(PasteTableAction.class));
+ api.addToPopup(DatabaseObjectType.CATALOG, coll.get(PasteTableAsAction.class));
- api.addToPopup(DatabaseObjectType.SESSION, coll.get(PasteTableAction.class));
+ api.addToPopup(DatabaseObjectType.SESSION, coll.get(PasteTableAsAction.class));
}
@@ -342,7 +349,42 @@
return copyDestSession;
}
- /**
+ @Override
+ public void setPasteToTableName(String pasteToTableName)
+ {
+ _pasteToTableName = pasteToTableName;
+ }
+
+ @Override
+ public String getPasteToTableName()
+ {
+ return _pasteToTableName;
+ }
+
+ @Override
+ public TableInfo getPasteToTableInfo(ISQLConnection destConn, String destSchema, String destCatalog)
+ {
+ if(null == _pasteToTableName)
+ {
+ return null;
+ }
+
+ if(1 != selectedDatabaseObjects.size() || false == selectedDatabaseObjects.get(0) instanceof TableInfo)
+ {
+ throw new IllegalStateException("Invalid paste table as state");
+ }
+
+ TableInfo ret = new TableInfo(destCatalog, destSchema, _pasteToTableName, "TABLE", null, destConn.getSQLMetaData());
+ return ret;
+ }
+
+ @Override
+ public boolean isCopiedFormDestinationSession()
+ {
+ return copyDestSession.equals(copySourceSession);
+ }
+
+ /**
* @see net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider#setDestSession(net.sourceforge.squirrel_sql.client.session.ISession)
*/
public void setDestSession(ISession session)
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/SessionInfoProvider.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/SessionInfoProvider.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/SessionInfoProvider.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -22,6 +22,8 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+import net.sourceforge.squirrel_sql.fw.sql.TableInfo;
/**
* This is implemented in order to pass needed info along to copy executor.
@@ -44,4 +46,12 @@
public void setDestSession(ISession session);
public ISession getDestSession();
+
+ void setPasteToTableName(String pasteToTableName);
+
+ String getPasteToTableName();
+
+ TableInfo getPasteToTableInfo(ISQLConnection destConn, String destSchema, String destCatalog);
+
+ boolean isCopiedFormDestinationSession();
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/UICallbacks.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/UICallbacks.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/UICallbacks.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -40,10 +40,9 @@
* Ask the user whether or not to append the new records to existing records
* in the specified table.
*
- * @param tableName
* @return
* @throws UserCancelledOperationException
*/
- public boolean appendRecordsToExisting(String tableName)
+ public boolean appendRecordsToExisting()
throws UserCancelledOperationException;
}
Copied: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java (from rev 6590, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/EditAliasFolderDlg.java)
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -0,0 +1,128 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.actions;
+
+import com.jidesoft.swing.MultilineLabel;
+import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class EditPasteTableNameDlg extends JDialog
+{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(EditPasteTableNameDlg.class);
+
+
+
+ private JTextField _txtFolderName = new JTextField();
+
+ private JButton _btnOK = new JButton(s_stringMgr.getString("EditPasteTableNameDlg.OK"));
+ private JButton _btnCancel = new JButton(s_stringMgr.getString("EditPasteTableNameDlg.Cancel"));
+
+ private String _tableName;
+
+
+ public EditPasteTableNameDlg(MainFrame mainFrame)
+ {
+ super(mainFrame, s_stringMgr.getString("EditPasteTableNameDlg.title"), true);
+ createUI();
+
+ _btnOK.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onOK();
+ }
+ });
+
+ getRootPane().setDefaultButton(_btnOK);
+
+ _btnCancel.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onCancel();
+ }
+ });
+
+
+ GUIUtils.enableCloseByEscape(this);
+
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ _txtFolderName.requestFocus();
+ }
+ });
+
+ setSize(400, 150);
+
+ }
+
+ private void onCancel()
+ {
+ close();
+ }
+
+ private void close()
+ {
+ setVisible(false);
+ dispose();
+ }
+
+ private void onOK()
+ {
+ if(null == _txtFolderName.getText() || 0 == _txtFolderName.getText().trim().length())
+ {
+ JOptionPane.showMessageDialog(this,s_stringMgr.getString("EditPasteTableNameDlg.TableNameEmpty"));
+ return;
+ }
+
+ _tableName = _txtFolderName.getText();
+
+ close();
+ }
+
+
+ private void createUI()
+ {
+ getContentPane().setLayout(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5), 0,0);
+ getContentPane().add(new MultilineLabel(s_stringMgr.getString("EditPasteTableNameDlg.text")), gbc);
+
+ gbc = new GridBagConstraints(0,1,1,1,1,0,GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5), 0,0);
+ getContentPane().add(_txtFolderName, gbc);
+
+ gbc = new GridBagConstraints(0,2,1,1,1,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ getContentPane().add(createButtonPanel(), gbc);
+ }
+
+ private JPanel createButtonPanel()
+ {
+ JPanel ret = new JPanel(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ ret.add(_btnOK, gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ ret.add(_btnCancel, gbc);
+
+ return ret;
+ }
+
+ public String getTableName()
+ {
+ return _tableName;
+ }
+}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -21,25 +21,11 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
-import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
-import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
-import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
-import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
-import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
-import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.util.Resources;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
-import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin;
import net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider;
-import net.sourceforge.squirrel_sql.plugins.dbcopy.commands.PasteTableCommand;
public class PasteTableAction extends SquirrelAction
@@ -53,14 +39,6 @@
/** The IApplication that we can use to display error dialogs */
private IApplication app = null;
- /** Logger for this class. */
- private final static ILogger log =
- LoggerController.createLogger(PasteTableAction.class);
-
- /** Internationalized strings for this class */
- private static final StringManager s_stringMgr =
- StringManagerFactory.getStringManager(PasteTableAction.class);
-
/**
* Creates a new SQuirreL action that gets fired whenever the user chooses
* the paste operation.
@@ -80,70 +58,10 @@
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(ActionEvent evt) {
- ISession destSession = sessionInfoProv.getDestSession();
- IObjectTreeAPI api =
- destSession.getObjectTreeAPIOfActiveSessionWindow();
- if (api == null) {
- return;
- }
- IDatabaseObjectInfo[] dbObjs = api.getSelectedDatabaseObjects();
- if (dbObjs.length > 1) {
- sessionInfoProv.setDestDatabaseObject(null);
- //i18n[PasteTableAction.error.multischemapaste=The paste
- //operation may only be applied to one schema at a time]
- String msg =
- s_stringMgr.getString("PasteTableAction.error.multischemapaste");
- app.showErrorDialog(msg);
-
- return;
- } else {
- // When the user pastes on a TABLE label which is located under a
- // schema/catalog, build the schema DatabaseObjectInfo.
- if (DatabaseObjectType.TABLE_TYPE_DBO.equals(dbObjs[0].getDatabaseObjectType())) {
- IDatabaseObjectInfo tableLabelInfo = dbObjs[0];
- ISQLConnection destCon = destSession.getSQLConnection();
- SQLDatabaseMetaData md = null;
- if (destCon != null) {
- md = destCon.getSQLMetaData();
- }
- IDatabaseObjectInfo schema =
- new DatabaseObjectInfo(null,
- tableLabelInfo.getSchemaName(),
- tableLabelInfo.getSchemaName(),
- DatabaseObjectType.SCHEMA,
- md);
- sessionInfoProv.setDestDatabaseObject(schema);
- } else {
- sessionInfoProv.setDestDatabaseObject(dbObjs[0]);
- }
-
- }
-
- try {
- IDatabaseObjectInfo info
- = sessionInfoProv.getDestDatabaseObject();
- if (info == null || destSession == null) {
- return;
- }
- if (!checkSession(destSession, info)) {
- return;
- }
- } catch (UserCancelledOperationException e) {
- return;
- }
- if (sessionInfoProv.getSourceSession() == null) {
- return;
- }
- if (!sourceDestSchemasDiffer()) {
- // TODO: tell the user that the selected destination schema is
- // the same as the source schema.
- //monitor.showMessageDialog(...)
- return;
- }
- new PasteTableCommand(sessionInfoProv).execute();
+ PasteTableUtil.excePasteTable(sessionInfoProv, app, null);
}
- /**
+ /**
* Set the current session.
*
* @param session The current session.
@@ -151,63 +69,5 @@
public void setSession(ISession session) {
sessionInfoProv.setDestSession(session);
}
-
- /**
- * This a work-around for the fact that some databases in SQuirreL show
- * "schemas" as catalogs (MySQL) while most others show them as "schemas".
- * If we restrict the Paste menu-item to schemas, then it won't appear in
- * the context menu in the MySQL object tree. However, if add catalogs to
- * the list of database objects that the paste menu item appears in, then
- * we must be careful not to attempt the copy operation on databases where
- * schema != catalog.(Otherwise the copy operation will fail as the qualified
- * name will be [catalog].[tablename] instead of [schema].[tablename]
- *
- * @param session
- * @param dbObjs
- *
- * @return true if it is ok to proceed with the copy operation; false otherwise.
- */
- private boolean checkSession(ISession session, IDatabaseObjectInfo dbObj)
- throws UserCancelledOperationException
- {
- if (session == null || dbObj == null) {
- return true;
- }
- String typeName = dbObj.getDatabaseObjectType().getName();
-
- log.debug("PasteTableAction.checkSession: dbObj type="+typeName+
- " name="+dbObj.getSimpleName());
- HibernateDialect d =
- DialectFactory.getDialect(DialectFactory.DEST_TYPE,
- session.getApplication().getMainFrame(),
- session.getMetaData());
- if (!d.canPasteTo(dbObj)) {
- //i18n[PasteTableAction.error.destdbobj=The destination database
- //doesn't support copying tables into '{0}' objects.\n Please
- //select a schema to paste into.]
- String errmsg =
- s_stringMgr.getString("PasteTableAction.error.destdbobj",
- new Object[] { typeName });
- app.showErrorDialog(errmsg);
- return false;
- }
- return true;
- }
-
- /**
- * Returns a boolean value indicating whether or not the source and
- * destination sessions refer to the same schema.
- *
- * @return
- */
- private boolean sourceDestSchemasDiffer() {
- //ISession sourceSession = sessionInfoProv.getCopySourceSession();
- //ISession destSession = sessionInfoProv.getCopyDestSession();
-
- // TODO: check to be sure that the source and destination schemas are
- // different. Abort if they are the same and inform the user.
-
- return true;
- }
}
Copied: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java (from rev 6590, trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAction.java)
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -0,0 +1,116 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.actions;
+/*
+ * Copyright (C) 2005 Rob Manning
+ * man...@us...
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
+import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
+import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import net.sourceforge.squirrel_sql.fw.sql.*;
+import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.commands.PasteTableCommand;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+
+
+public class PasteTableAsAction extends SquirrelAction
+ implements ISessionAction {
+
+ /** Current plugin. */
+ private final SessionInfoProvider sessionInfoProv;
+
+ /** The IApplication that we can use to display error dialogs */
+ private IApplication app = null;
+
+ /** Logger for this class. */
+ private final static ILogger log =
+ LoggerController.createLogger(PasteTableAsAction.class);
+
+ /** Internationalized strings for this class */
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(PasteTableAsAction.class);
+
+ /**
+ * Creates a new SQuirreL action that gets fired whenever the user chooses
+ * the paste operation.
+ *
+ * @param app
+ * @param rsrc
+ * @param plugin
+ */
+ public PasteTableAsAction(IApplication app, Resources rsrc,
+ DBCopyPlugin plugin) {
+ super(app, rsrc);
+ this.app = app;
+ sessionInfoProv = plugin;
+ }
+
+ /* (non-Javadoc)
+ * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+ */
+ public void actionPerformed(ActionEvent evt) {
+
+ if(null == sessionInfoProv.getSourceDatabaseObjects())
+ {
+ return;
+ }
+
+ if(1 != sessionInfoProv.getSourceDatabaseObjects().size())
+ {
+ JOptionPane.showMessageDialog(app.getMainFrame(), s_stringMgr.getString("EditPasteTableNameDlg.onlyOneTableMsg"));
+ return;
+ }
+
+ EditPasteTableNameDlg dlg = new EditPasteTableNameDlg(app.getMainFrame());
+ GUIUtils.centerWithinParent(dlg);
+ dlg.setVisible(true);
+
+ if(null == dlg.getTableName())
+ {
+ return;
+ }
+
+ PasteTableUtil.excePasteTable(sessionInfoProv, app, dlg.getTableName());
+
+
+ System.out.println("dlg.getTableName() = " + dlg.getTableName());
+
+ }
+
+ /**
+ * Set the current session.
+ *
+ * @param session The current session.
+ */
+ public void setSession(ISession session) {
+ sessionInfoProv.setDestSession(session);
+ }
+}
Added: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableUtil.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableUtil.java (rev 0)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableUtil.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -0,0 +1,149 @@
+package net.sourceforge.squirrel_sql.plugins.dbcopy.actions;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
+import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
+import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
+import net.sourceforge.squirrel_sql.fw.sql.*;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider;
+import net.sourceforge.squirrel_sql.plugins.dbcopy.commands.PasteTableCommand;
+
+public class PasteTableUtil
+{
+ private final static ILogger log = LoggerController.createLogger(PasteTableUtil.class);
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(PasteTableUtil.class);
+
+
+ public static void excePasteTable(SessionInfoProvider sessionInfoProv, IApplication app1, String pasteToTableName)
+ {
+ ISession destSession = sessionInfoProv.getDestSession();
+ IObjectTreeAPI api =
+ destSession.getObjectTreeAPIOfActiveSessionWindow();
+ if (api == null) {
+ return;
+ }
+ IDatabaseObjectInfo[] dbObjs = api.getSelectedDatabaseObjects();
+ if (dbObjs.length > 1) {
+ sessionInfoProv.setDestDatabaseObject(null);
+ //i18n[PasteTableAction.error.multischemapaste=The paste
+ //operation may only be applied to one schema at a time]
+ String msg =
+ s_stringMgr.getString("PasteTableAction.error.multischemapaste");
+ app1.showErrorDialog(msg);
+
+ return;
+ } else {
+ // When the user pastes on a TABLE label which is located under a
+ // schema/catalog, build the schema DatabaseObjectInfo.
+ if (DatabaseObjectType.TABLE_TYPE_DBO.equals(dbObjs[0].getDatabaseObjectType())) {
+ IDatabaseObjectInfo tableLabelInfo = dbObjs[0];
+ ISQLConnection destCon = destSession.getSQLConnection();
+ SQLDatabaseMetaData md = null;
+ if (destCon != null) {
+ md = destCon.getSQLMetaData();
+ }
+ IDatabaseObjectInfo schema =
+ new DatabaseObjectInfo(null,
+ tableLabelInfo.getSchemaName(),
+ tableLabelInfo.getSchemaName(),
+ DatabaseObjectType.SCHEMA,
+ md);
+ sessionInfoProv.setDestDatabaseObject(schema);
+ } else {
+ sessionInfoProv.setDestDatabaseObject(dbObjs[0]);
+ }
+
+ sessionInfoProv.setPasteToTableName(pasteToTableName);
+
+ }
+
+ try {
+ IDatabaseObjectInfo info
+ = sessionInfoProv.getDestDatabaseObject();
+ if (info == null || destSession == null) {
+ return;
+ }
+ if (!checkSession(destSession, info, app1)) {
+ return;
+ }
+ } catch (UserCancelledOperationException e) {
+ return;
+ }
+ if (sessionInfoProv.getSourceSession() == null) {
+ return;
+ }
+ if (!sourceDestSchemasDiffer()) {
+ // TODO: tell the user that the selected destination schema is
+ // the same as the source schema.
+ //monitor.showMessageDialog(...)
+ return;
+ }
+ new PasteTableCommand(sessionInfoProv).execute();
+ }
+
+ /**
+ * This a work-around for the fact that some databases in SQuirreL show
+ * "schemas" as catalogs (MySQL) while most others show them as "schemas".
+ * If we restrict the Paste menu-item to schemas, then it won't appear in
+ * the context menu in the MySQL object tree. However, if add catalogs to
+ * the list of database objects that the paste menu item appears in, then
+ * we must be careful not to attempt the copy operation on databases where
+ * schema != catalog.(Otherwise the copy operation will fail as the qualified
+ * name will be [catalog].[tablename] instead of [schema].[tablename]
+ *
+ * @param app1
+ * @param session
+ * @param dbObjs
+ *
+ * @return true if it is ok to proceed with the copy operation; false otherwise.
+ */
+ private static boolean checkSession(ISession session, IDatabaseObjectInfo dbObj, IApplication app1)
+ throws UserCancelledOperationException
+ {
+ if (session == null || dbObj == null) {
+ return true;
+ }
+ String typeName = dbObj.getDatabaseObjectType().getName();
+
+ log.debug("PasteTableAction.checkSession: dbObj type="+typeName+
+ " name="+dbObj.getSimpleName());
+
+ HibernateDialect d =
+ DialectFactory.getDialect(DialectFactory.DEST_TYPE,
+ session.getApplication().getMainFrame(),
+ session.getMetaData());
+ if (!d.canPasteTo(dbObj)) {
+ //i18n[PasteTableAction.error.destdbobj=The destination database
+ //doesn't support copying tables into '{0}' objects.\n Please
+ //select a schema to paste into.]
+ String errmsg =
+ s_stringMgr.getString("PasteTableAction.error.destdbobj",
+ new Object[] { typeName });
+ app1.showErrorDialog(errmsg);
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Returns a boolean value indicating whether or not the source and
+ * destination sessions refer to the same schema.
+ *
+ * @return
+ */
+ private static boolean sourceDestSchemasDiffer() {
+ //ISession sourceSession = sessionInfoProv.getCopySourceSession();
+ //ISession destSession = sessionInfoProv.getCopyDestSession();
+
+ // TODO: check to be sure that the source and destination schemas are
+ // different. Abort if they are the same and inform the user.
+
+ return true;
+ }
+}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/PreferencesPanel.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/PreferencesPanel.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/gui/PreferencesPanel.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -74,7 +74,9 @@
JCheckBox pruneDuplicateIndexDefs = null;
JCheckBox writeScriptCheckBox = null;
-
+
+ JCheckBox appendRecordsToExistingCheckBox = null;
+
JCheckBox promptForHibernateCheckBox = null;
JCheckBox checkKeywordsCheckBox = null;
@@ -167,7 +169,8 @@
addDelayRecordsTextField(result, 1, 14);
addWriteScriptCheckBox(result, 0, 15);
-
+ addAppendRecordsToExistingCheckBox(result, 0, 16);
+
return result;
}
@@ -203,13 +206,31 @@
writeScriptCheckBox.setToolTipText(toolTipText);
panel.add(writeScriptCheckBox, c);
}
-
+
+ private void addAppendRecordsToExistingCheckBox(JPanel panel, int col, int row) {
+ GridBagConstraints c = new GridBagConstraints();
+ c.gridx = col;
+ c.gridy = row;
+ c.gridwidth = 2; // Span across two columns
+ c.insets = new Insets(10,0,0,0);
+ c.anchor = GridBagConstraints.WEST;
+ String cbLabelStr =
+ s_stringMgr.getString("PreferencesPanel.appendRecordsToExistingCheckBox");
+ String toolTipText =
+ s_stringMgr.getString("PreferencesPanel.appendRecordsToExistingCheckBoxToolTip");
+ appendRecordsToExistingCheckBox = new JCheckBox(cbLabelStr);
+ appendRecordsToExistingCheckBox.setToolTipText(toolTipText);
+ panel.add(appendRecordsToExistingCheckBox, c);
+ }
+
private void addUseTruncateCheckBox(JPanel panel, int col, int row) {
GridBagConstraints c = new GridBagConstraints();
c.gridx = col;
c.gridy = row;
c.gridwidth = 2; // Span across two columns
- String cbToolTipText =
+ c.insets = new Insets(10,0,0,0);
+ c.anchor = GridBagConstraints.WEST;
+ String cbToolTipText =
s_stringMgr.getString("PreferencesPanel.truncateLabelTipText");
truncateCheckBox.setToolTipText(cbToolTipText);
panel.add(truncateCheckBox, c);
@@ -628,6 +649,7 @@
copyForeignKeys.setSelected(_prefs.isCopyForeignKeys());
copyPrimaryKeys.setSelected(_prefs.isCopyPrimaryKeys());
writeScriptCheckBox.setSelected(_prefs.isWriteScript());
+ appendRecordsToExistingCheckBox.setSelected(_prefs.isAppendRecordsToExisting());
pruneDuplicateIndexDefs.setSelected(_prefs.isPruneDuplicateIndexDefs());
commitAfterCreateTableCheckBox.setSelected(_prefs.isCommitAfterTableDefs());
promptForHibernateCheckBox.setSelected(_prefs.isPromptForDialect());
@@ -651,6 +673,7 @@
_prefs.setCopyForeignKeys(copyForeignKeys.isSelected());
_prefs.setCopyPrimaryKeys(copyPrimaryKeys.isSelected());
_prefs.setWriteScript(writeScriptCheckBox.isSelected());
+ _prefs.setAppendRecordsToExisting(appendRecordsToExistingCheckBox.isSelected());
_prefs.setPruneDuplicateIndexDefs(pruneDuplicateIndexDefs.isSelected());
_prefs.setCommitAfterTableDefs(commitAfterCreateTableCheckBox.isSelected());
_prefs.setPromptForDialect(promptForHibernateCheckBox.isSelected());
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/prefs/DBCopyPreferenceBean.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/prefs/DBCopyPreferenceBean.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/prefs/DBCopyPreferenceBean.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -60,7 +60,7 @@
private boolean copyForeignKeys = true;
/** whether or not to copy the primary keys */
- private boolean copyPrimaryKeys = true;
+ private boolean copyPrimaryKeys = false;
/** whether or not to discard logically identical index defs */
private boolean pruneDuplicateIndexDefs = true;
@@ -88,8 +88,10 @@
/** default number of milliseconds to wait between copying records */
private long recordDelayMillis = 0;
-
- public DBCopyPreferenceBean() {
+
+ private boolean _appendRecordsToExisting;
+
+ public DBCopyPreferenceBean() {
super();
}
@@ -411,6 +413,15 @@
public boolean isDelayBetweenObjects() {
return delayBetweenObjects;
}
-
+
+ public boolean isAppendRecordsToExisting()
+ {
+ return _appendRecordsToExisting;
+ }
+
+ public void setAppendRecordsToExisting(boolean appendRecordsToExisting)
+ {
+ _appendRecordsToExisting = appendRecordsToExisting;
+ }
}
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/util/DBUtil.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/util/DBUtil.java 2012-02-25 19:13:36 UTC (rev 6592)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/util/DBUtil.java 2012-02-28 22:05:08 UTC (rev 6593)
@@ -49,15 +49,7 @@
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
-import net.sourceforge.squirrel_sql.fw.sql.ForeignKeyInfo;
-import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
-import net.sourceforge.squirrel_sql.fw.sql.JDBCTypeMapper;
-import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
-import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
+import net.sourceforge.squirrel_sql.fw.sql.*;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
@@ -1411,7 +1403,7 @@
}
}
- public static String getCreateTableSql(SessionInfoProvider prov, ITableInfo ti) throws SQLException,
+ public static String getCreateTableSql(SessionInfoProvider prov, ITableInfo ti, String destTableName, String destSchema, String destCatalog) throws SQLException,
MappingException, UserCancelledOperationException
{
@@ -1421,10 +1413,10 @@
String sourceTableName = getQualifiedObjectName(
sourceSession, sourceCatalog, sourceSchema, ti.getSimpleName(), DialectFactory.SOURCE_TYPE);
ISession destSession = prov.getDestSession();
- String destSchema = prov.getDestDatabaseObject().getSimpleName();
- String destCatalog = prov.getDestDatabaseObject().getCatalogName();
+// String destSchema = getSchemaNameFromDbObject(prov.getDestDatabaseObject());
+// String destCatalog = prov.getDestDatabaseObject().getCatalogName();
String destinationTableName = getQualifiedObjectName(
- destSession, destCatalog, destSchema, ti.getSimpleName(), DialectFactory.DEST_TYPE);
+ destSession, destCatalog, destSchema, destTableName, DialectFactory.DEST_TYPE);
StringBuilder result = new StringBuilder("CREATE TABLE ");
result.append(destinationTableName);
result.append(" ( ");
@@ -1514,13 +1506,13 @@
* Uses the column type mapper to get the column type and appends that to the name with an optional not
* null modifier.
*
- * @param colInfo
- * @return
- * @throws UserCancelledOperationException
+ *
+ * @param colInfo
+ * @throws UserCancelledOperationException
* @throws MappingException
*/
public static String getColumnSql(SessionInfoProvider prov, TableColumnInfo colInfo,
- String sourceTableName, String destTableName) throws UserCancelledOperationException,
+ String sourceTableName, String destTableName) throws UserCancelledOperationException,
MappingException
{
String columnName = colInfo.getColumnName();
@@ -1641,7 +1633,7 @@
{
StringBuilder result = new StringBuilder();
result.append("insert into ");
- String destSchema = prov.getDestDatabaseObject().getSimpleName();
+ String destSchema = DBUtil.getSchemaNameFromDbObject(prov.getDestDatabaseObject());
String destCatalog = prov.getDestDatabaseObject().getCatalogName();
ISession destSession = prov.getDestSession();
result.append(getQualifiedObjectName(
@@ -2060,5 +2052,36 @@
}
return result;
}
-
+
+ public static String getSchemaNameFromDbObject(IDatabaseObjectInfo dbObject)
+ {
+ String destSchema;
+
+ if (dbObject.getDatabaseObjectType().equals(DatabaseObjectType.SCHEMA))
+ {
+ destSchema = dbObject.getSimpleName();
+ }
+ else
+ {
+ destSchema = dbObject.getSchemaName();
+ }
+ return destSchema;
+ }
+
+ public static IDatabaseObjectInfo getSchemaFromDbObject(IDatabaseObjectInfo dbObject, SchemaInfo schemaInfo)
+ {
+ if (dbObject.getDatabaseObjectType().equals(DatabaseObjectType.SCHEMA))
+ {
+ return dbObject;
+ }
+ else
+ {
+ return new DatabaseObjectInfo(dbObject.getCatalogName(),
+ dbObject.getSchemaName(),
+ dbObject.getSimpleName(),
+ DatabaseObjectType.SCHEMA,
+ schemaInfo.getSQLDatabaseMetaData());
+
+ }
+ }
}
Modified: trunk/sql12/plugins/dbcopy/src/main/resources/net/sourceforge/squirrel_sql/plugins/dbcopy/I18NStrings.properties
==...
[truncated message content] |
|
From: <wi...@us...> - 2012-02-25 19:13:42
|
Revision: 6592
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6592&view=rev
Author: wis775
Date: 2012-02-25 19:13:36 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Removed deprecated code
Modified Paths:
--------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ForeignKeyInfo.java
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ForeignKeyInfo.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ForeignKeyInfo.java 2012-02-21 00:15:49 UTC (rev 6591)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/ForeignKeyInfo.java 2012-02-25 19:13:36 UTC (rev 6592)
@@ -48,30 +48,6 @@
private final int _deferability;
private ForeignKeyColumnInfo[] _columnInfo;
- /**
- * @deprecated use the version of the constructor accepts fk and pk column
- * names.
- */
- ForeignKeyInfo(String pkCatalog, String pkSchema, String pkTableName,
- String fkCatalog, String fkSchema, String fkTableName,
- int updateRule, int deleteRule, String fkName,
- String pkName, int deferability,
- ForeignKeyColumnInfo[] columnInfo, SQLDatabaseMetaData md)
- {
- super(fkCatalog, fkSchema, fkName, DatabaseObjectType.FOREIGN_KEY, md);
- _pkCatalog = pkCatalog;
- _pkSchema = pkSchema;
- _pkTableName = pkTableName;
- _fkTableName = fkTableName;
- _updateRule = updateRule;
- _deleteRule = deleteRule;
- _pkName = pkName;
- _deferability = deferability;
- setForeignKeyColumnInfo(columnInfo);
- _pkColumnName = null;
- _fkColumnName = null;
- }
-
ForeignKeyInfo(String pkCatalog, String pkSchema, String pkTableName,
String pkColumnName, String fkCatalog, String fkSchema,
String fkTableName, String fkColumnName,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6591
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6591&view=rev
Author: manningr
Date: 2012-02-21 00:15:49 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
Fixed compile issue.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java 2012-02-20 21:46:22 UTC (rev 6590)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/MockSession.java 2012-02-21 00:15:49 UTC (rev 6591)
@@ -541,4 +541,11 @@
System.err.println("MockSession.isSessionWidgetActive: stub not yet implemented");
return false;
}
+
+ @Override
+ public JdbcConnectionData getJdbcData()
+ {
+ System.err.println("MockSession.getJdbcData: stub not yet implemented");
+ return null;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-20 21:46:28
|
Revision: 6590
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6590&view=rev
Author: manningr
Date: 2012-02-20 21:46:22 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Use the new version (3.3.1) of the plugin parent pom when generating a plugin project from the archetype. The 3.3.0 version referred to 3.3.0-SNAPSHOT of the plugin assembly descriptor, which is no longer available since the release of 3.3.0.(This meant that the build would fail to compile if you removed your local repo cache).
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2012-02-20 21:29:56 UTC (rev 6589)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2012-02-20 21:46:22 UTC (rev 6590)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1</version>
</parent>
<groupId>${groupId}</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-20 21:30:02
|
Revision: 6589
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6589&view=rev
Author: manningr
Date: 2012-02-20 21:29:56 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Moved version back to being specified by the parent pom, now that this project has the same version as the parent
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 20:44:17 UTC (rev 6588)
+++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 21:29:56 UTC (rev 6589)
@@ -3,13 +3,12 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SQuirreL-SQL Plugins Parent POM</name>
@@ -392,4 +391,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-20 20:44:23
|
Revision: 6588
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6588&view=rev
Author: manningr
Date: 2012-02-20 20:44:17 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 20:44:13 UTC (rev 6587)
+++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 20:44:17 UTC (rev 6588)
@@ -9,7 +9,7 @@
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.3.1</version>
+ <version>3.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SQuirreL-SQL Plugins Parent POM</name>
@@ -40,9 +40,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugins-parent-pom-3.3.1</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugins-parent-pom-3.3.1</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugins-parent-pom-3.3.1</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugins-parent-pom</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugins-parent-pom</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugins-parent-pom</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
