From dc302f89c79e6f8396a658b74ff07de515fd6338 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 16 Dec 2024 09:46:07 +0100
Subject: [PATCH] Display comments into TABLES and COLUMNS lists #755

---
 packages/types/dbinfo.d.ts                       |  2 +-
 packages/web/src/appobj/ColumnAppObject.svelte   | 16 +++++++++++++++-
 .../src/appobj/DatabaseObjectAppObject.svelte    |  3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/types/dbinfo.d.ts b/packages/types/dbinfo.d.ts
index 45511e271..3a50fbbfd 100644
--- a/packages/types/dbinfo.d.ts
+++ b/packages/types/dbinfo.d.ts
@@ -75,7 +75,7 @@ export interface DatabaseObjectInfo extends NamedObjectInfo {
   modifyDate?: string;
   hashCode?: string;
   objectTypeField?: string;
-  obejctComment?: string;
+  objectComment?: string;
 }
 
 export interface SqlObjectInfo extends DatabaseObjectInfo {
diff --git a/packages/web/src/appobj/ColumnAppObject.svelte b/packages/web/src/appobj/ColumnAppObject.svelte
index 37aa9b6f9..65259a9a9 100644
--- a/packages/web/src/appobj/ColumnAppObject.svelte
+++ b/packages/web/src/appobj/ColumnAppObject.svelte
@@ -35,7 +35,21 @@
     ];
   }
 
-  $: extInfo = data.foreignKey ? `${data.dataType} -> ${data.foreignKey.refTableName}` : data.dataType;
+  function getExtInfo(data) {
+    const res = [];
+    if (data.foreignKey) {
+      res.push(`${data.dataType} -> ${data.foreignKey.refTableName}`);
+    } else {
+      res.push(data.dataType);
+    }
+    if (data.columnComment) {
+      res.push(data.columnComment);
+    }
+    if (res.length > 0) return res.join(', ');
+    return null;
+  }
+
+  $: extInfo = getExtInfo(data);
 </script>
 
 <AppObjectCore
diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
index 5fc4e413f..5e4ffeb5f 100644
--- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
@@ -932,6 +932,9 @@
 
   function getExtInfo(data) {
     const res = [];
+    if (data.objectComment) {
+      res.push(data.objectComment);
+    }
     if (data.tableRowCount != null) {
       res.push(`${formatRowCount(data.tableRowCount)} rows`);
     }