@hienlh/ppm 0.13.75 → 0.13.77

package/src/web/components/database/sql-completion-provider.ts

@@ -22,6 +22,32 @@ export const AGGREGATE_FNS = ["COUNT", "SUM", "AVG", "MIN", "MAX"];
 export const OPERATORS = ["=", "!=", "<>", ">", "<", ">=", "<=", "LIKE", "ILIKE", "IN", "NOT IN", "BETWEEN", "IS NULL", "IS NOT NULL"];
 export const SORT_DIRS = ["ASC", "DESC"];
 
+/** Find the SQL statement surrounding the cursor line (split by ;) */
+export function getStatementAtCursor(text: string, cursorLine: number): string {
+  const lines = text.split("\n");
+  let stmtStart = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const trimmed = lines[i]!.trim();
+    if (i < cursorLine - 1 && trimmed.endsWith(";")) {
+      stmtStart = i + 1;
+    }
+  }
+  let stmtEnd = lines.length - 1;
+  for (let i = cursorLine - 1; i < lines.length; i++) {
+    const trimmed = lines[i]!.trim();
+    if (trimmed.endsWith(";")) {
+      stmtEnd = i;
+      break;
+    }
+  }
+  while (stmtStart <= stmtEnd) {
+    const t = lines[stmtStart]!.trim();
+    if (t && !t.startsWith("--")) break;
+    stmtStart++;
+  }
+  return lines.slice(stmtStart, stmtEnd + 1).join("\n").trim();
+}
+
 /** Client-side column cache to avoid redundant fetches */
 const columnCache = new Map<string, { name: string; type: string }[]>();
 
@@ -153,7 +179,8 @@ export function createSqlCompletionProvider(
           startColumn: word.startColumn, endColumn: word.endColumn,
         };
         const fullText = model.getValue();
-        const { tableRefs, aliasMap } = extractTableRefs(fullText);
+        const currentStmt = getStatementAtCursor(fullText, position.lineNumber);
+        const { tableRefs, aliasMap } = extractTableRefs(currentStmt);
         const suggestions: MonacoType.languages.CompletionItem[] = [];
         const ctx = getCompletionContext(textUntilPosition);
 

package/src/web/components/database/sql-query-editor.tsx

@@ -2,7 +2,7 @@ import { useState, useCallback, useRef, useEffect } from "react";
 import Editor, { type OnMount } from "@monaco-editor/react";
 import type * as MonacoType from "monaco-editor";
 import { useMonacoTheme } from "@/lib/use-monaco-theme";
-import { createSqlCompletionProvider, clearCompletionCache, type SchemaInfo } from "./sql-completion-provider";
+import { createSqlCompletionProvider, clearCompletionCache, getStatementAtCursor, type SchemaInfo } from "./sql-completion-provider";
 
 interface SqlQueryEditorProps {
   onExecute: (sql: string) => void;
@@ -15,35 +15,6 @@ interface SqlQueryEditorProps {
   persistedSql?: string;
 }
 
-/** Find the SQL statement surrounding the cursor line (split by ;) */
-export function getStatementAtCursor(text: string, cursorLine: number): string {
-  const lines = text.split("\n");
-  // Find statement boundaries (lines where a statement ends with ;)
-  let stmtStart = 0;
-  for (let i = 0; i < lines.length; i++) {
-    const trimmed = lines[i]!.trim();
-    if (i < cursorLine - 1 && trimmed.endsWith(";")) {
-      stmtStart = i + 1;
-    }
-  }
-  // Find statement end
-  let stmtEnd = lines.length - 1;
-  for (let i = cursorLine - 1; i < lines.length; i++) {
-    const trimmed = lines[i]!.trim();
-    if (trimmed.endsWith(";")) {
-      stmtEnd = i;
-      break;
-    }
-  }
-  // Skip leading empty/comment lines
-  while (stmtStart <= stmtEnd) {
-    const t = lines[stmtStart]!.trim();
-    if (t && !t.startsWith("--")) break;
-    stmtStart++;
-  }
-  return lines.slice(stmtStart, stmtEnd + 1).join("\n").trim();
-}
-
 /** Shared Monaco-based SQL query editor (editor only, no results) */
 export function SqlQueryEditor({ onExecute, loading, defaultValue = "SELECT * FROM ", schemaInfo, onSqlChange, persistedSql }: SqlQueryEditorProps) {
   const [query, setQuery] = useState(() => persistedSql ?? defaultValue);