Improved DbExport Gu

Author: hudeany

lib_soderer/soderer-utilities-24.1.8.jar

@@ -790,7 +790,9 @@ private static int connectionTest(final ConnectionTestDefinition connectionTestD
 				if (testConnection != null) {
 					try {
 						System.out.println(DateUtilities.formatDate(DateUtilities.YYYY_MM_DD_HHMMSS, LocalDateTime.now()) + ": Closing database connection");
-						testConnection.close();
+						if (!testConnection.isClosed()) {
+							testConnection.close();
+						}
 					} catch (final SQLException e) {
 						System.out.println(DateUtilities.formatDate(DateUtilities.YYYY_MM_DD_HHMMSS, LocalDateTime.now()) + ": Error closing database connection: " + e.getMessage());
 						returnCode = 1;

src/de/soderer/dbexport/DbExport.java

@@ -57,6 +57,7 @@
 import de.soderer.utilities.http.HttpUtilities;
 import de.soderer.utilities.swing.ApplicationConfigurationDialog;
 import de.soderer.utilities.swing.DualProgressDialog;
+import de.soderer.utilities.swing.ProgressDialog;
 import de.soderer.utilities.swing.QuestionDialog;
 import de.soderer.utilities.swing.SecurePreferencesDialog;
 import de.soderer.utilities.swing.SwingColor;
@@ -1229,8 +1230,16 @@ private void export(final DbExportDefinition dbExportDefinition, final DbExportG
 			// The worker parent is set later by the opened DualProgressDialog
 			final AbstractDbExportWorker worker = dbExportDefinition.getConfiguredWorker(null);
 
-			final DualProgressDialog<AbstractDbExportWorker> progressDialog = new DualProgressDialog<>(dbExportGui, DbExport.APPLICATION_NAME, null, worker);
-			final Result result = progressDialog.open();
+			final Result result;
+			if (dbExportDefinition.getSqlStatementOrTablelist().toLowerCase().startsWith("select ") ||
+					(!dbExportDefinition.getSqlStatementOrTablelist().contains("*")
+							&& !dbExportDefinition.getSqlStatementOrTablelist().contains("?"))) {
+				final ProgressDialog<AbstractDbExportWorker> progressDialog = new ProgressDialog<>(dbExportGui, DbExport.APPLICATION_NAME, null, worker);
+				result = progressDialog.open();
+			} else {
+				final DualProgressDialog<AbstractDbExportWorker> progressDialog = new DualProgressDialog<>(dbExportGui, DbExport.APPLICATION_NAME, null, worker);
+				result = progressDialog.open();
+			}
 
 			if (result == Result.CANCELED) {
 				new QuestionDialog(dbExportGui, DbExport.APPLICATION_NAME, LangResources.get("error.canceledbyuser")).setBackgroundColor(SwingColor.Yellow).open();

src/de/soderer/dbexport/DbExportGui.java

@@ -370,6 +370,8 @@ public Boolean work() throws Exception {
 
 						try {
 							export(connection, sqlStatement, nextOutputFilePath);
+						} catch (final DbExportException e) {
+							throw e;
 						} catch (final Exception e) {
 							throw new Exception("Error occurred while exporting\n" + sqlStatement + "\n" + e.getMessage(), e);
 						}
@@ -794,6 +796,8 @@ private void export(final Connection connection, final String sqlStatement, Stri
 
 				if (new File(outputFilePath).exists()) {
 					throw new DbExportException("Outputfile already exists: " + outputFilePath);
+				} else if (!new File(outputFilePath).getParentFile().exists()) {
+					throw new DbExportException("Outputfile parent directory does not exist: " + new File(outputFilePath).getParent());
 				}
 
 				if (log) {