From 24c6972df7cf13750471dffef0dff6d4913eb142 Mon Sep 17 00:00:00 2001
From: Francesco <stelk.mc@gmail.com>
Date: Mon, 23 Oct 2023 10:31:49 +0200
Subject: [PATCH] WIP SQL console: better sorting of result columns

---
 .../external/dbmapping/query/DbQueryResultRow.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/tech/ailef/dbadmin/external/dbmapping/query/DbQueryResultRow.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/query/DbQueryResultRow.java
index a6b325c..1490b81 100644
--- a/src/main/java/tech/ailef/dbadmin/external/dbmapping/query/DbQueryResultRow.java
+++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/query/DbQueryResultRow.java
@@ -14,7 +14,15 @@ public class DbQueryResultRow {
 	}
 	
 	public List<DbQueryOutputField> getSortedFields() {
-		return values.keySet().stream().sorted((f1, f2) -> f1.getName().compareTo(f2.getName())).toList();
+		return values.keySet().stream().sorted((f1, f2) -> {
+			if (f1.isPrimaryKey() && !f2.isPrimaryKey()) {
+				return -1;
+			} else if (!f1.isPrimaryKey() && f2.isPrimaryKey()) {
+				return 1;
+			} else {
+				return f1.getName().compareTo(f2.getName());
+			}
+		}).toList();
 	}
 	
 	public String getQuery() {