From c778711c7b058cb10319ce5ea6b6b5b62ba9a2cf Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 11 Sep 2025 16:22:17 +0530
Subject: [PATCH 1/3] fix: preferences fallback logic.

---
 src/lib/stores/preferences.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index 4e3e3224fd..36419be280 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -220,7 +220,8 @@ function createPreferences() {
         loadTeamPrefs: loadTeamPreferences,
 
         getDisplayNames: (tableId: string) => {
-            return teamPreferences?.displayNames?.[tableId] ?? ['$id'];
+            const names = teamPreferences?.displayNames?.[tableId];
+            return Array.isArray(names) && names.length > 0 ? names : ['$id'];
         },
 
         setDisplayNames: async (

From e17ae664828f1fe848e336158fcc446c794a51c6 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 11 Sep 2025 17:00:29 +0530
Subject: [PATCH 2/3] add: relationship type on columns page cell.

---
 .../database-[database]/subNavigation.svelte  |  4 ++-
 .../table-[table]/columns/+page.svelte        | 26 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
index a33c4e15be..535304213d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
@@ -41,7 +41,9 @@
         tables: []
     });
 
-    const sortedTables = $derived.by(() => tables?.tables);
+    const sortedTables = $derived.by(
+        () => tables?.tables?.slice().sort((a, b) => a.name.localeCompare(b.name))
+    );
 
     const selectedTable = $derived.by(() =>
         sortedTables?.find((table: Models.Table) => table.$id === tableId)
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
index 59df944c33..24bab8fadf 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
@@ -164,6 +164,24 @@
         }
     }
 
+    function getRelationshipTypeForColumn(column: Columns): string | null {
+        if (!isRelationship(column)) {
+            return null;
+        }
+
+        const relationshipMap = {
+            oneToOne: 'One to one',
+            oneToMany: 'One to many',
+            manyToOne: 'Many to one',
+            manyToMany: 'Many to many'
+        };
+
+        const relationType = (column as Models.ColumnRelationship).relationType;
+        const formattedType = relationshipMap[relationType] || relationType;
+
+        return `Type: ${formattedType}`;
+    }
+
     onDestroy(() => ($showCreateColumnSheet.show = false));
 
     $effect(() => {
@@ -222,7 +240,6 @@
                 <Spreadsheet.Header.Cell column="actions" {root} />
             </svelte:fragment>
 
-            <!-- TODO: variable and terminology changes -->
             {#each updatedColumnsForSheet as column, index}
                 {@const option = columnOptions.find((option) => option.type === column.type)}
                 {@const isSelectable =
@@ -290,12 +307,19 @@
                                 </Layout.Stack>
                             </Layout.Stack>
                             {@const minMaxSize = getMinMaxSizeForColumn(column)}
+                            {@const relationType = getRelationshipTypeForColumn(column)}
                             {#if minMaxSize}
                                 <Typography.Caption
                                     variant="400"
                                     color="--fgcolor-neutral-tertiary">
                                     {minMaxSize}
                                 </Typography.Caption>
+                            {:else if relationType}
+                                <Typography.Caption
+                                    variant="400"
+                                    color="--fgcolor-neutral-tertiary">
+                                    {relationType}
+                                </Typography.Caption>
                             {/if}
                         </Layout.Stack>
                     </Spreadsheet.Cell>

From b3b18061164b20aad982b86ac50fedbe1dd0e3d1 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 11 Sep 2025 17:00:51 +0530
Subject: [PATCH 3/3] lint.

---
 .../databases/database-[database]/subNavigation.svelte        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
index 535304213d..8ab8b314ef 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
@@ -41,8 +41,8 @@
         tables: []
     });
 
-    const sortedTables = $derived.by(
-        () => tables?.tables?.slice().sort((a, b) => a.name.localeCompare(b.name))
+    const sortedTables = $derived.by(() =>
+        tables?.tables?.slice().sort((a, b) => a.name.localeCompare(b.name))
     );
 
     const selectedTable = $derived.by(() =>