cancel query on tab close

Author: pkolovos

src/main/java/gr/sqlbrowserfx/nodes/sqlpane/DraggingTabPaneSupport.java

@@ -5,11 +5,15 @@
 import gr.sqlbrowserfx.utils.JavaFXUtils;
 import javafx.collections.ListChangeListener.Change;
 import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
+import javafx.scene.control.TextField;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.Dragboard;
+import javafx.scene.input.KeyCode;
 import javafx.scene.input.TransferMode;
 
 public class DraggingTabPaneSupport {
@@ -32,6 +36,7 @@ public DraggingTabPaneSupport(String dragIconUrl) {
 
 	public void addSupport(TabPane tabPane) {
         tabPane.getTabs().forEach(this::addDragHandlers);
+
         tabPane.getTabs().addListener((Change<? extends Tab> c) -> {
             while (c.next()) {
                 if (c.wasAdded()) {
@@ -107,7 +112,7 @@ private void addDragHandlers(Tab tab) {
             tab.setText(null);
             tab.setGraphic(label);
         }
-
+        
         Node graphic = tab.getGraphic();
         graphic.setOnDragDetected(e -> {
             Dragboard dragboard = graphic.startDragAndDrop(TransferMode.MOVE);

src/main/java/gr/sqlbrowserfx/nodes/sqlpane/SqlPane.java

@@ -601,23 +601,23 @@ protected void getDataFromDB(String table, final SqlTableTab sqlTableTab) {
 			query += " limit " + linesLimit;
 		}
 
-		String message = "Executing : " + query;
-		logger.debug(message);
+		logger.debug("Executing : " + query);
 		try {
-			sqlConnector.executeQueryRawSafely(query, resultSet -> {
-				sqlTableView.setItemsLater(resultSet);
-				// in case the query contains a view reset name
+	        sqlConnector.executeCancelableQuery(query, rset -> {
+	        	sqlTableView.setItemsLater(rset);
 				sqlTableView.setTableName(table);
-			});
+	        }, 
+    		stmt -> sqlTableTab.setOnClosed(action -> {
+	            try {
+	                stmt.cancel();
+	            } catch (SQLException e) {
+	                LoggerFactory.getLogger(LoggerConf.LOGGER_NAME).error(e.getMessage());
+	            }
+	        }));
 
 		} catch (SQLException e) {
 			DialogFactory.createErrorNotification(e);
 			if (e.getErrorCode() == MemoryGuard.SQL_MEMORY_ERROR_CODE) {
-				// TODO what must be done here in order to free memory?
-//				Platform.runLater(() -> {
-//					sqlTableTab.getOnClosed().handle(new ActionEvent());
-//					tablesTabPane.getTabs().remove(sqlTableTab);
-//				});
 				System.gc();
 			}
 		} finally {

src/main/java/gr/sqlbrowserfx/nodes/tableviews/SqlTableView.java

@@ -245,7 +245,7 @@ public synchronized void setItemsLater(ResultSet rs) throws SQLException {
 				parent.load();
 				this.clear();
 			});
-			throw new SQLException("MemoryGuard action", "", MemoryGuard.SQL_MEMORY_ERROR_CODE);
+			throw new SQLException("Query cnacelled", "", MemoryGuard.SQL_MEMORY_ERROR_CODE);
 		}
 
 		Platform.runLater(() -> {