From fd08e2c3e6b42b88b9babfdd852860cea9cfe5f8 Mon Sep 17 00:00:00 2001
From: eshmeshek <georgy.egorov.ah@gmail.com>
Date: Wed, 28 Jan 2026 01:08:53 +0300
Subject: [PATCH] 	modified:   frontend/src/components/SqlEditor.tsx

---
 frontend/src/components/SqlEditor.tsx | 38 ++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/SqlEditor.tsx b/frontend/src/components/SqlEditor.tsx
index 1cd1860..03686b2 100644
--- a/frontend/src/components/SqlEditor.tsx
+++ b/frontend/src/components/SqlEditor.tsx
@@ -96,24 +96,40 @@ function getFkSuggestions(
   tablesInQuery: TableInfo[],
   schema: SchemaData,
   monaco: Monaco,
-  range: any
+  range: any,
+  sql: string
 ): any[] {
   const suggestions: any[] = [];
+  const aliases = parseTableAliases(sql);
+
+  // Create reverse alias map: tableName -> alias (or tableName if no alias)
+  const tableToAlias = new Map<string, string>();
+  for (const [alias, tableName] of aliases) {
+    // Prefer shorter alias over table name
+    const existing = tableToAlias.get(tableName);
+    if (!existing || alias.length < existing.length) {
+      tableToAlias.set(tableName, alias);
+    }
+  }
 
   for (const table of tablesInQuery) {
     for (const fk of table.foreign_keys) {
       // Find the referenced table
       const refTable = schema.tables.find(t => t.name === fk.references_table);
       if (refTable && tablesInQuery.some(t => t.name === refTable.name)) {
-        const joinCondition = `${table.name}.${fk.column} = ${refTable.name}.${fk.references_column}`;
+        // Use alias if available, otherwise table name
+        const sourceAlias = tableToAlias.get(table.name) || table.name;
+        const targetAlias = tableToAlias.get(refTable.name) || refTable.name;
+
+        const joinCondition = `${sourceAlias}.${fk.column} = ${targetAlias}.${fk.references_column}`;
         suggestions.push({
           label: joinCondition,
           kind: monaco.languages.CompletionItemKind.Snippet,
           insertText: joinCondition,
-          detail: `FK: ${table.name} → ${refTable.name}`,
-          documentation: `Foreign key relationship`,
+          detail: `FK: ${table.name}.${fk.column} → ${refTable.name}.${fk.references_column}`,
+          documentation: `Foreign key relationship between ${table.name} and ${refTable.name}`,
           range,
-          sortText: '0' + joinCondition, // Sort FK suggestions first
+          sortText: '0' + joinCondition,
         });
       }
     }
@@ -194,12 +210,16 @@ export default function SqlEditor({ value, onChange, databaseId, height }: SqlEd
         }
 
         // Check if we're after ON keyword (FK suggestions)
-        const onMatch = textBeforeCursor.match(/\bON\s+$/i);
+        // Match: "ON ", "ON  ", "on ", after JOIN ... ON
+        const fullText = model.getValue();
+        const onMatch = textBeforeCursor.match(/\bON\s*$/i) || textUntilPosition.match(/\bJOIN\s+\w+\s+\w*\s+ON\s*$/i);
         if (onMatch && currentSchema) {
-          const tablesInQuery = findTablesInQuery(textUntilPosition, currentSchema);
-          const fkSuggestions = getFkSuggestions(tablesInQuery, currentSchema, monaco, range);
+          const tablesInQuery = findTablesInQuery(fullText, currentSchema);
+          const fkSuggestions = getFkSuggestions(tablesInQuery, currentSchema, monaco, range, fullText);
+          // Add FK suggestions to the top, but also include other suggestions
           if (fkSuggestions.length > 0) {
-            return { suggestions: fkSuggestions };
+            suggestions = [...fkSuggestions, ...suggestions];
+            return { suggestions };
           }
         }