feat: add test connection and cancel query fix

Author: dancixx

package.json

@@ -1,7 +1,7 @@
 {
   "name": "rsql",
   "private": true,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rsql"
-version = "1.1.1"
+version = "1.1.2"
 description = "Modern SQL Client"
 authors = ["rust-dd"]
 edition = "2024"

src-tauri/Cargo.toml

@@ -94,6 +94,27 @@ async fn acquire_client(
         .map_err(|e| AppError::ConnectionFailed(e.to_string()))
 }
 
+async fn apply_statement_timeout(
+    client: &deadpool_postgres::Client,
+    timeout_ms: u32,
+) {
+    if timeout_ms > 0 {
+        client
+            .simple_query(&format!("SET statement_timeout = {}", timeout_ms))
+            .await
+            .ok();
+    }
+}
+
+async fn reset_statement_timeout(
+    client: &deadpool_postgres::Client,
+    timeout_ms: u32,
+) {
+    if timeout_ms > 0 {
+        client.simple_query("RESET statement_timeout").await.ok();
+    }
+}
+
 async fn set_cancel_token(
     app_state: &AppState,
     project_id: &str,
@@ -377,6 +398,39 @@ async fn restore_virtual_from_snapshot(
     Ok(true)
 }
 
+#[tauri::command(rename_all = "snake_case")]
+pub async fn pgsql_test_connection(
+    key: [&str; 6],
+) -> Result<String> {
+    let user = key[0];
+    let password = key[1];
+    let database = key[2];
+    let host = key[3];
+    let port: u16 = key[4].parse().unwrap_or(5432);
+    let use_ssl = key[5] == "true";
+
+    let mut cfg = Config::new();
+    cfg.user(user)
+        .password(password)
+        .dbname(database)
+        .host(host)
+        .port(port);
+
+    let pool = create_pg_pool(&cfg, use_ssl, 1)?;
+    let client = pool
+        .get()
+        .await
+        .map_err(|e| AppError::ConnectionFailed(full_error_chain(&e)))?;
+
+    let row = client
+        .query_one("SELECT version()", &[])
+        .await
+        .map_err(|e| AppError::ConnectionFailed(e.to_string()))?;
+
+    let version: String = row.get(0);
+    Ok(version)
+}
+
 #[tauri::command(rename_all = "snake_case")]
 pub async fn pgsql_connector(
     project_id: &str,
@@ -836,12 +890,18 @@ pub async fn pgsql_cancel_query(project_id: &str, app_state: State<'_, AppState>
 pub async fn pgsql_run_query_packed(
     project_id: &str,
     sql: &str,
+    timeout_ms: Option<u32>,
     app_state: State<'_, AppState>,
 ) -> Result<Response> {
     let client = acquire_client(&app_state.clients, project_id).await?;
     set_cancel_token(&app_state, project_id, client.cancel_token()).await?;
 
-    let result = execute_query_packed(&client, sql).await?;
+    let timeout = timeout_ms.unwrap_or(0);
+    apply_statement_timeout(&client, timeout).await;
+    let result = execute_query_packed(&client, sql).await;
+    reset_statement_timeout(&client, timeout).await;
+
+    let result = result?;
     let json = sonic_rs::to_string(&result).map_err(|e| AppError::QueryFailed(e.to_string()))?;
     Ok(Response::new(json))
 }
@@ -868,13 +928,18 @@ pub async fn pgsql_execute_virtual(
     sql: &str,
     query_id: &str,
     page_size: usize,
+    timeout_ms: Option<u32>,
     app_state: State<'_, AppState>,
 ) -> Result<Response> {
     let client = acquire_client(&app_state.clients, project_id).await?;
     set_cancel_token(&app_state, project_id, client.cancel_token()).await?;
 
+    let timeout = timeout_ms.unwrap_or(0);
+    apply_statement_timeout(&client, timeout).await;
     let result =
-        execute_virtual(&client, &app_state.virtual_cache, sql, query_id, page_size).await?;
+        execute_virtual(&client, &app_state.virtual_cache, sql, query_id, page_size).await;
+    reset_statement_timeout(&client, timeout).await;
+    let result = result?;
 
     let col_count = if result.0.is_empty() {
         0

src-tauri/src/drivers/pgsql.rs

@@ -259,6 +259,7 @@ fn main() {
             dbs::workspace::workspace_save,
             dbs::workspace::workspace_load_all,
             dbs::workspace::workspace_delete,
+            drivers::pgsql::pgsql_test_connection,
             drivers::pgsql::pgsql_connector,
             drivers::pgsql::pgsql_load_databases,
             drivers::pgsql::pgsql_load_tablespaces,

src-tauri/src/main.rs

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "rsql",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "identifier": "com.rust-dd.rsql",
   "build": {
     "beforeDevCommand": "yarn dev",

src-tauri/tauri.conf.json

@@ -44,7 +44,8 @@ function isQueryCancelledError(message: string): boolean {
   return lower.includes("canceling statement due to user request")
     || lower.includes("cancelling statement due to user request")
     || lower.includes("query canceled")
-    || lower.includes("query cancelled");
+    || lower.includes("query cancelled")
+    || lower.includes("statement timeout");
 }
 
 function notifyQueryComplete(sql: string, time: number, success: boolean, rowCount?: number) {
@@ -126,11 +127,13 @@ export default function App() {
         setVirtualQuery(idx, undefined);
       }
 
+      const timeoutMs = tab.queryTimeout || undefined;
+
       if (driver.executeVirtual) {
         const sql = tab.editorValue;
         const queryId = crypto.randomUUID().replace(/-/g, "").slice(0, 12);
         const [colsPacked, totalRows, pagePacked, elapsed] =
-          await driver.executeVirtual(tab.projectId, sql, queryId, PAGE_SIZE);
+          await driver.executeVirtual(tab.projectId, sql, queryId, PAGE_SIZE, timeoutMs);
 
         if (!colsPacked) {
           // Fallback format from backend: header + rows in one packed string.
@@ -180,7 +183,7 @@ export default function App() {
         }
       } else {
         // One-shot fallback
-        const [cols, rows, time] = await driver.runQuery(tab.projectId, tab.editorValue);
+        const [cols, rows, time] = await driver.runQuery(tab.projectId, tab.editorValue, timeoutMs);
         updateResult(idx, { columns: cols, rows, time });
         notifyQueryComplete(tab.editorValue, time, true, rows.length);
         addHistoryEntry({
@@ -472,6 +475,7 @@ export default function App() {
               <EditorToolbar
                 onExecute={() => void runQuery()}
                 onExplain={() => void runExplain()}
+                onCancel={() => void cancelQuery()}
               />
               <div className="flex flex-1 min-h-0 overflow-hidden">
                 {/* Left pane */}
@@ -531,6 +535,7 @@ export default function App() {
               <EditorToolbar
                 onExecute={() => void runQuery()}
                 onExplain={() => void runExplain()}
+                onCancel={() => void cancelQuery()}
               />
               <div style={{ height: `${editorHeight}%` }} className="flex flex-col overflow-hidden">
                 <QueryEditor

src/App.tsx

@@ -4,7 +4,9 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } f
 import { Button } from "./ui/button"
 import { Input } from "./ui/input"
 import { Label } from "./ui/label"
+import { Loader2, CheckCircle2, XCircle } from "lucide-react"
 import { DRIVER_CONFIGS } from "@/lib/database-driver"
+import { pgsqlTestConnection } from "@/tauri"
 import type { DriverType, ProjectDetails } from "@/types"
 
 interface ConnectionModalProps {
@@ -75,6 +77,8 @@ export function ConnectionModal({ open, onOpenChange, onSave, editData }: Connec
   const [formData, setFormData] = useState<Omit<ConnectionConfig, "id">>(defaultForm)
   const [connString, setConnString] = useState("")
   const [connStringError, setConnStringError] = useState(false)
+  const [testing, setTesting] = useState(false)
+  const [testResult, setTestResult] = useState<{ ok: boolean; message: string } | null>(null)
 
   useEffect(() => {
     if (open && editData) {
@@ -96,10 +100,12 @@ export function ConnectionModal({ open, onOpenChange, onSave, editData }: Connec
       })
       setConnString("")
       setConnStringError(false)
+      setTestResult(null)
     } else if (open && !editData) {
       setFormData(defaultForm)
       setConnString("")
       setConnStringError(false)
+      setTestResult(null)
     }
   }, [open, editData])
 
@@ -117,6 +123,28 @@ export function ConnectionModal({ open, onOpenChange, onSave, editData }: Connec
 
   const isEditing = !!editData
 
+  const handleTestConnection = async () => {
+    setTesting(true)
+    setTestResult(null)
+    try {
+      const key: [string, string, string, string, string, string] = [
+        formData.username,
+        formData.password,
+        formData.database,
+        formData.host,
+        formData.port,
+        formData.ssl ? "true" : "false",
+      ]
+      const version = await pgsqlTestConnection(key)
+      setTestResult({ ok: true, message: version })
+    } catch (err: unknown) {
+      const msg = err instanceof Error ? err.message : String(err)
+      setTestResult({ ok: false, message: msg })
+    } finally {
+      setTesting(false)
+    }
+  }
+
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault()
     const connection: ConnectionConfig = {
@@ -341,13 +369,42 @@ export function ConnectionModal({ open, onOpenChange, onSave, editData }: Connec
             )}
           </div>
 
-          <div className="flex justify-end gap-2 pt-4">
-            <Button type="button" variant="ghost" onClick={() => onOpenChange(false)} className="font-mono text-xs">
-              Cancel
-            </Button>
-            <Button type="submit" variant="gradient" className="font-mono text-xs">
-              {isEditing ? "Save Changes" : "Connect"}
+          {testResult && (
+            <div
+              className={`flex items-start gap-2 rounded-lg border px-3 py-2 text-xs font-mono ${
+                testResult.ok
+                  ? "border-emerald-500/30 bg-emerald-500/5 text-emerald-500"
+                  : "border-destructive/30 bg-destructive/5 text-destructive"
+              }`}
+            >
+              {testResult.ok ? (
+                <CheckCircle2 className="h-3.5 w-3.5 shrink-0 mt-0.5" />
+              ) : (
+                <XCircle className="h-3.5 w-3.5 shrink-0 mt-0.5" />
+              )}
+              <span className="break-all">{testResult.message}</span>
+            </div>
+          )}
+
+          <div className="flex justify-between pt-4">
+            <Button
+              type="button"
+              variant="outline"
+              onClick={() => void handleTestConnection()}
+              disabled={testing || !formData.host || !formData.database}
+              className="font-mono text-xs"
+            >
+              {testing && <Loader2 className="h-3 w-3 animate-spin mr-1.5" />}
+              Test Connection
             </Button>
+            <div className="flex gap-2">
+              <Button type="button" variant="ghost" onClick={() => onOpenChange(false)} className="font-mono text-xs">
+                Cancel
+              </Button>
+              <Button type="submit" variant="gradient" className="font-mono text-xs">
+                {isEditing ? "Save Changes" : "Connect"}
+              </Button>
+            </div>
           </div>
         </form>
       </DialogContent>