show FK columns in table details view, don't count comments in SQL cons.

Wisser · Aug 18, 2023 · 8b1573a · 8b1573a
1 parent 7e09160
commit 8b1573a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/main/gui/net/sf/jailer/ui/databrowser/metadata/TableDetailsView.java b/src/main/gui/net/sf/jailer/ui/databrowser/metadata/TableDetailsView.java
@@ -34,10 +34,12 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Consumer;
 
 import javax.swing.DefaultComboBoxModel;
@@ -89,9 +91,25 @@ public TableDetailsView(final Table table, final MDTable mdTable, final MetaData
         	commentLabel.setVisible(false);
         }
 
+        Set<Column> fks = new HashSet<>();
+
+        table.associations.forEach(a -> {
+        	a.createSourceToDestinationKeyMapping().keySet().forEach(c -> fks.add(c));
+        });
+
 		renderConsumer = new HashMap<String, Consumer<JLabel>>();
 		table.getColumns().forEach(c -> { if (c.name != null) { renderConsumer.put(Quoting.staticUnquote(c.name), label -> label.setIcon(emptyIcon)); }});
-    	if (table.primaryKey != null) {
+		fks.forEach(c -> {
+			if (c.name != null) {
+				renderConsumer.put(c.name, 
+						label -> {
+							label.setForeground(Color.blue);
+							label.setIcon(emptyIcon);
+						}
+				);
+			}
+		});
+		if (table.primaryKey != null) {
 			table.primaryKey.getColumns().forEach(c -> {
 				if (c.name != null) {
 					renderConsumer.put(c.name, 
@@ -301,6 +319,8 @@ public int compare(Column o1, Column o2) {
 
 			        if (isPk) {
 			        	label.setForeground(Color.red);
+			        } else if (fks.contains(column)) {
+			        	label.setForeground(Color.blue);
 			        }
 
 			        label.setText(Quoting.staticUnquote(column.name));

diff --git a/src/main/gui/net/sf/jailer/ui/databrowser/sqlconsole/SQLConsole.java b/src/main/gui/net/sf/jailer/ui/databrowser/sqlconsole/SQLConsole.java
@@ -1081,10 +1081,7 @@ private void executeSQL(final String sql, final Status status, int statementStar
 	            	resetAutoCommitConnection = connection;
 	            }
 	        }
-	        status.numStatements++;
-            localStatus.numStatements++;
-            UISettings.s3++;
-            status.updateView(false);
+	        status.updateView(false);
             statement = connection.createStatement();
 			if (session.dbms != null) {
 				Object limit = limitComboBox.getSelectedItem();
@@ -1105,6 +1102,11 @@ private void executeSQL(final String sql, final Status status, int statementStar
             		.replaceAll("((?:\\n(?: |\\t|\\r)*?)) ?\\\\([ \\t\\r]*)(?=\\n)", "$1");
 			sqlStatement = sqlPlusSupport.replaceVariables(sqlStatement, positionOffsets);
 			status.statement = sqlStatement;
+			if (!isCommentOnly(sqlStatement)) {
+				status.numStatements++;
+	            localStatus.numStatements++;
+	            UISettings.s3++;
+			}
 	        boolean loadButtonIsVisible = true;
             boolean hasResultSet;
             boolean hasUpdateCount = true;
@@ -1915,7 +1917,6 @@ public void run() {
                 }
                 status.failed = true;
                 status.error = error;
-                status.numStatements--;
             }
             if (error instanceof CancellationException) {
             	status.cancelled = true;