diff --git a/scripts/database-picker.test.mjs b/scripts/database-picker.test.mjs new file mode 100644 index 0000000..a617ed2 --- /dev/null +++ b/scripts/database-picker.test.mjs @@ -0,0 +1,25 @@ +import assert from 'node:assert/strict'; +import { test } from 'node:test'; +import { build } from 'esbuild'; + +const { outputFiles } = await build({ + entryPoints: ['src/utils/databasePicker.ts'], + bundle: true, + platform: 'node', + format: 'esm', + write: false, +}); +const { filterDatabases, moveDatabaseSelection } = await import( + `data:text/javascript;base64,${Buffer.from(outputFiles[0].contents).toString('base64')}` +); + +test('database search is case-insensitive and trims whitespace', () => { + assert.deepEqual(filterDatabases(['shop', 'Customer_Archive', 'customer_live'], ' CUSTOMER '), + ['Customer_Archive', 'customer_live']); +}); + +test('database keyboard selection wraps and stays safe for empty results', () => { + assert.equal(moveDatabaseSelection(0, 3, -1), 2); + assert.equal(moveDatabaseSelection(2, 3, 1), 0); + assert.equal(moveDatabaseSelection(0, 0, 1), 0); +}); diff --git a/scripts/window-close-permission.test.mjs b/scripts/window-close-permission.test.mjs new file mode 100644 index 0000000..33b3dbd --- /dev/null +++ b/scripts/window-close-permission.test.mjs @@ -0,0 +1,8 @@ +import assert from 'node:assert/strict'; +import { readFileSync } from 'node:fs'; +import { test } from 'node:test'; + +test('main window can finish a close request after workspace recovery flushes', () => { + const capability = JSON.parse(readFileSync('src-tauri/capabilities/default.json', 'utf8')); + assert.ok(capability.permissions.includes('core:window:allow-destroy')); +}); diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index 520a6e2..97e039f 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -5,6 +5,7 @@ "windows": ["main"], "permissions": [ "core:default", + "core:window:allow-destroy", "opener:default", "dialog:default", "dialog:allow-save", diff --git a/src-tauri/src/core/query_engine.rs b/src-tauri/src/core/query_engine.rs index 2e0789a..8b3c213 100644 --- a/src-tauri/src/core/query_engine.rs +++ b/src-tauri/src/core/query_engine.rs @@ -239,12 +239,25 @@ fn build_explain_sql(sql: &str, database_type: &DatabaseType) -> Result Ok(format!("{prefix} {statement}")) } +fn quote_database_name(name: &str, dialect: &str) -> Result { + if name.trim().is_empty() || name.contains('\0') { + return Err(anyhow!( + "Database name cannot be empty or contain a NUL character" + )); + } + match dialect { + "postgres" => Ok(format!("\"{}\"", name.replace('"', "\"\""))), + "mysql" => Ok(format!("`{}`", name.replace('`', "``"))), + _ => Err(anyhow!("Unsupported database type")), + } +} + #[cfg(test)] mod tests { use super::{ build_browse_order_clause, build_explain_sql, build_seek_predicate, build_where_clause, - group_foreign_keys, json_boolean_number, mysql_type_is_boolean, with_seek_predicate, - PendingExport, QueryEngine, TableExportWriter, + group_foreign_keys, json_boolean_number, mysql_type_is_boolean, quote_database_name, + with_seek_predicate, PendingExport, QueryEngine, TableExportWriter, }; use crate::core::{ connection_manager::ConnectionManager, ConnectionConfig, DatabaseType, FilterConfig, @@ -252,6 +265,20 @@ mod tests { use serde_json::{json, Value}; use uuid::Uuid; + #[test] + fn database_creation_quotes_names_as_single_identifiers() { + assert_eq!( + quote_database_name("shop\"; DROP DATABASE prod; --", "postgres").unwrap(), + "\"shop\"\"; DROP DATABASE prod; --\"" + ); + assert_eq!( + quote_database_name("shop`; DROP DATABASE prod; --", "mysql").unwrap(), + "`shop``; DROP DATABASE prod; --`" + ); + assert!(quote_database_name("", "postgres").is_err()); + assert!(quote_database_name("bad\0name", "mysql").is_err()); + } + #[test] fn table_browse_uses_primary_key_as_stable_tie_breaker() { let keys = vec!["id".to_string()]; @@ -2003,7 +2030,10 @@ impl QueryEngine { { let pools = manager.get_postgres_pools().await; if let Some(pool) = pools.get(connection_id) { - let sql = format!("CREATE DATABASE \"{}\"", db_name); + let sql = format!( + "CREATE DATABASE {}", + quote_database_name(db_name, "postgres")? + ); sqlx::query(&sql).execute(pool).await?; return Ok(()); } @@ -2013,7 +2043,7 @@ impl QueryEngine { { let pools = manager.get_mysql_pools().await; if let Some(pool) = pools.get(connection_id) { - let sql = format!("CREATE DATABASE `{}`", db_name); + let sql = format!("CREATE DATABASE {}", quote_database_name(db_name, "mysql")?); sqlx::query(&sql).execute(pool).await?; return Ok(()); } diff --git a/src/components/DatabaseSelectorModal.tsx b/src/components/DatabaseSelectorModal.tsx index 6f02e73..7fc5d63 100644 --- a/src/components/DatabaseSelectorModal.tsx +++ b/src/components/DatabaseSelectorModal.tsx @@ -1,270 +1,249 @@ -import { useState, useEffect, useRef } from 'react'; -import { Search, Database, Plus, X, ChevronRight, AlertCircle } from 'lucide-react'; -import { useDatabaseStore } from '../store/databaseStore'; +import { useEffect, useRef, useState, type KeyboardEvent } from 'react'; +import { AlertCircle, Check, Database, Loader2, Plus, Search, X } from 'lucide-react'; import { invoke } from '@tauri-apps/api/core'; +import { useDatabaseStore } from '../store/databaseStore'; +import { useRecoveryStore } from '../store/recoveryStore'; import { invokeWithExecutionPolicy } from '../utils/executionPolicy'; +import { filterDatabases, moveDatabaseSelection } from '../utils/databasePicker'; +import { parseRowDraftContext } from '../utils/rowDrafts'; import { cn } from '../utils/cn'; export const DatabaseSelectorModal = () => { - const { - showDatabaseSelector, - setShowDatabaseSelector, - activeConnectionId, - activeDatabase, - setActiveDatabase, - databases, - setDatabases - } = useDatabaseStore(); - + const showDatabaseSelector = useDatabaseStore(state => state.showDatabaseSelector); + const setShowDatabaseSelector = useDatabaseStore(state => state.setShowDatabaseSelector); + const activeConnectionId = useDatabaseStore(state => state.activeConnectionId); + const activeDatabase = useDatabaseStore(state => state.activeDatabase); + const setActiveDatabase = useDatabaseStore(state => state.setActiveDatabase); + const setDatabases = useDatabaseStore(state => state.setDatabases); + const savedConnections = useDatabaseStore(state => state.savedConnections); + const drafts = useRecoveryStore(state => state.drafts); + + const [databases, setListedDatabases] = useState([]); const [search, setSearch] = useState(''); const [selectedIndex, setSelectedIndex] = useState(0); const [isCreating, setIsCreating] = useState(false); const [newDbName, setNewDbName] = useState(''); const [error, setError] = useState(null); + const [isLoading, setIsLoading] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false); - - const modalRef = useRef(null); const inputRef = useRef(null); + const listRef = useRef(null); - const filteredDatabases = databases.filter(db => - db.toLowerCase().includes(search.toLowerCase()) - ); + const filteredDatabases = filterDatabases(databases, search); + const selectedDatabase = filteredDatabases[selectedIndex]; + const canCreateDatabase = savedConnections.find(connection => connection.id === activeConnectionId)?.type !== 'Sqlite'; useEffect(() => { - if (showDatabaseSelector && activeConnectionId) { - setSearch(''); - setSelectedIndex(0); - setIsCreating(false); - setError(null); - - // Fetch latest database list when modal opens - setIsSubmitting(true); - invoke('get_databases', { connectionId: activeConnectionId }) - .then(dbs => { - setDatabases(dbs); - setIsSubmitting(false); - }) - .catch(err => { - console.error('Failed to fetch databases in modal:', err); - setError(err.toString()); - setIsSubmitting(false); - }); + if (!showDatabaseSelector || !activeConnectionId) return; - setTimeout(() => inputRef.current?.focus(), 50); - } - }, [showDatabaseSelector, activeConnectionId, setDatabases]); + let current = true; + setSearch(''); + setSelectedIndex(0); + setIsCreating(false); + setNewDbName(''); + setError(null); + setListedDatabases([]); + setIsLoading(true); + + invoke('get_databases', { connectionId: activeConnectionId }) + .then(result => { + if (!current) return; + setListedDatabases(result); + setDatabases(result); + setSelectedIndex(Math.max(0, result.indexOf(activeDatabase || ''))); + }) + .catch(cause => { + if (current) setError(`Could not load databases: ${String(cause)}`); + }) + .finally(() => { + if (current) setIsLoading(false); + }); + + return () => { current = false; }; + }, [showDatabaseSelector, activeConnectionId, activeDatabase, setDatabases]); useEffect(() => { - setSelectedIndex(0); - }, [search]); + if (showDatabaseSelector && !isCreating && !isLoading) { + listRef.current?.querySelector(`[data-picker-index="${selectedIndex}"]`)?.scrollIntoView({ block: 'nearest' }); + } + }, [showDatabaseSelector, isCreating, isLoading, selectedIndex, search, databases]); - const handleClose = () => setShowDatabaseSelector(false); + const handleClose = () => { + if (!isSubmitting) setShowDatabaseSelector(false); + }; - const handleSelect = async (db: string) => { - try { - await setActiveDatabase(db); + const confirmSwitchAway = () => { + const hasDrafts = drafts.some(draft => { + const context = parseRowDraftContext(draft.context); + return draft.change_count > 0 && context?.[0] === activeConnectionId && context[1] === activeDatabase; + }); + return !hasDrafts || window.confirm('Switching databases will close this connection\'s table tabs. Pending row edits are preserved as drafts, but must be reviewed when you return. Switch anyway?'); + }; + + const handleSelect = async (database: string) => { + if (isSubmitting || !activeConnectionId) return; + if (database === activeDatabase) { handleClose(); - } catch (err) { - setError(String(err)); + return; + } + + if (!confirmSwitchAway()) return; + + setIsSubmitting(true); + setError(null); + try { + await setActiveDatabase(database); + setShowDatabaseSelector(false); + } catch (cause) { + setError(`Could not open ${database}: ${String(cause)}`); + } finally { + setIsSubmitting(false); } }; const handleCreate = async () => { - if (!newDbName.trim() || !activeConnectionId) return; - + const name = newDbName.trim(); + if (!name || !activeConnectionId || isSubmitting || !canCreateDatabase) return; + if (databases.some(database => database.toLocaleLowerCase() === name.toLocaleLowerCase())) { + setError('A database with this name already exists.'); + return; + } + if (!confirmSwitchAway()) return; + setIsSubmitting(true); setError(null); try { await invokeWithExecutionPolicy('create_database', activeConnectionId, activeDatabase || '', - { kind: 'create_database', payload: newDbName.trim() }, { dbName: newDbName.trim() }); - - // Refresh database list - const updatedDbs = await invoke('get_databases', { connectionId: activeConnectionId }); - setDatabases(updatedDbs); - - // Select the new database - await setActiveDatabase(newDbName.trim()); + { kind: 'create_database', payload: name }, { dbName: name }); + const updated = await invoke('get_databases', { connectionId: activeConnectionId }); + setDatabases(updated); + await setActiveDatabase(name); useDatabaseStore.getState().triggerRefresh(true); - handleClose(); - } catch (err: any) { - setError(err.toString()); + setShowDatabaseSelector(false); + } catch (cause) { + setError(`Could not create database: ${String(cause)}`); } finally { setIsSubmitting(false); } }; - const handleKeyDown = (e: React.KeyboardEvent) => { - if (e.key === 'Escape') handleClose(); - - if (isCreating) { - if (e.key === 'Enter') handleCreate(); + const handleKeyDown = (event: KeyboardEvent) => { + if (event.key === 'Escape') { + event.stopPropagation(); + handleClose(); return; } - - if (e.key === 'ArrowDown') { - e.preventDefault(); - setSelectedIndex(prev => (prev + 1) % Math.max(1, filteredDatabases.length)); - } else if (e.key === 'ArrowUp') { - e.preventDefault(); - setSelectedIndex(prev => (prev - 1 + filteredDatabases.length) % Math.max(1, filteredDatabases.length)); - } else if (e.key === 'Enter') { - if (filteredDatabases.length > 0) { - handleSelect(filteredDatabases[selectedIndex]); + if (isCreating) { + if (event.key === 'Enter' && event.target === inputRef.current) { + event.preventDefault(); + void handleCreate(); } + return; + } + if (event.key === 'ArrowDown' || event.key === 'ArrowUp') { + event.preventDefault(); + setSelectedIndex(index => moveDatabaseSelection(index, filteredDatabases.length, event.key === 'ArrowDown' ? 1 : -1)); + } else if (event.key === 'Enter' && event.target === inputRef.current && selectedDatabase) { + event.preventDefault(); + void handleSelect(selectedDatabase); } }; - if (!showDatabaseSelector) return null; + if (!showDatabaseSelector || !activeConnectionId) return null; return ( -
{ - if (e.target === e.currentTarget) handleClose(); - }} - className="fixed inset-0 z-[100] flex items-start justify-center pt-[15vh] px-4 backdrop-blur-sm bg-black/40 animate-in fade-in duration-200" - > -
- {/* Header / Search */} -
-
-

- - {isCreating ? 'Create New Database' : 'Open Database'} -

- -
- +
{ + if (event.target === event.currentTarget) handleClose(); + }}> +
+
+

+ + {isCreating ? 'New Database' : 'Open Database'} +

+ +
+ +
- - + isCreating ? setNewDbName(e.target.value) : setSearch(e.target.value)} - placeholder={isCreating ? "Database name..." : "Search for database... (⌘K)"} - className="w-full bg-[#2C2C2C] border border-[#3C3C3C] rounded-lg pl-10 pr-4 py-2.5 text-sm focus:outline-none focus:border-accent shadow-inner transition-all" - /> + onChange={event => { + if (isCreating) setNewDbName(event.target.value); + else { + setSearch(event.target.value); + setSelectedIndex(0); + } + setError(null); + }} + placeholder={isCreating ? 'Database name...' : 'Search for database...'} + disabled={isSubmitting} + className="w-full rounded-md border border-border-strong bg-background py-2 pl-9 pr-3 text-sm text-text-primary outline-none placeholder:text-text-muted focus:border-accent disabled:opacity-50" />
- {/* Content */} -
- {error && ( -
- -

{error}

-
- )} + {error &&
+ {error} +
} - {isCreating ? ( -
-

- You are creating a new database in the current connection. -

-
- - + {isCreating ? ( +
+ Create a database in the current connection. Write protection may require confirmation. +
+ ) : ( +
+ {isLoading ? ( +
Loading databases...
+ ) : filteredDatabases.length ? filteredDatabases.map((database, index) => ( + + )) : ( +
+ {error ? 'Database list unavailable.' : 'No databases found.'}
-
- ) : ( -
- {filteredDatabases.length > 0 ? ( - filteredDatabases.map((db, index) => ( - - )) - ) : ( -
-
- -
-
-

No databases found

-

Try a different search term or create one.

-
-
- )} -
- )} -
+ )} +
+ )} - {/* Footer */} - {!isCreating && ( -
-
-
- ↑↓ - Navigate -
-
- Enter - Open -
-
- Esc - Close -
-
- - +
+ {!isCreating && canCreateDatabase && } +
- )} +
); diff --git a/src/components/Toolbar.tsx b/src/components/Toolbar.tsx index 16d3fab..20f4fda 100644 --- a/src/components/Toolbar.tsx +++ b/src/components/Toolbar.tsx @@ -36,7 +36,6 @@ export const Toolbar = ({ activeTable, savedConnections, setActiveDatabase, - databases, setDatabases, safeMode, setSafeMode, @@ -53,8 +52,6 @@ export const Toolbar = ({ } = useDatabaseStore(); const [connDropdownOpen, setConnDropdownOpen] = useState(false); - const [dbDropdownOpen, setDbDropdownOpen] = useState(false); - const [dbSearch, setDbSearch] = useState(''); const [switchError, setSwitchError] = useState(null); const [switchingId, setSwitchingId] = useState(null); const [passwordPrompt, setPasswordPrompt] = useState<{ @@ -66,10 +63,8 @@ export const Toolbar = ({ }>({ visible: false, connection: null, password: '', sshPassword: '', remember: false }); const connDropdownRef = useRef(null); - const dbDropdownRef = useRef(null); useOutsideClick(connDropdownRef, () => setConnDropdownOpen(false), connDropdownOpen); - useOutsideClick(dbDropdownRef, () => setDbDropdownOpen(false), dbDropdownOpen); const connection = savedConnections.find(c => c.id === activeConnectionId); const connectionDetails = connection ? connectionIdentity(connection) : null; @@ -128,10 +123,6 @@ export const Toolbar = ({ } }, [activeConnectionId, activeDatabase, setDatabases, setActiveDatabase]); - const filteredDatabases = databases.filter(db => - db.toLowerCase().includes(dbSearch.toLowerCase()) - ); - return (
{/* Left side: Action Controls */} @@ -266,7 +257,6 @@ export const Toolbar = ({
- {activeDatabase && ( + {activeConnectionId && ( <> -
- - - {dbDropdownOpen && ( -
-
-
- - setDbSearch(e.target.value)} - placeholder="Search database..." - className="w-full bg-background border border-border-strong rounded px-7 py-1 text-[11px] text-text-primary focus:outline-none focus:border-accent/50" - /> -
-
-
- {filteredDatabases.length > 0 ? ( - filteredDatabases.map(db => ( - - )) - ) : ( -
No databases found
- )} -
-
- -
-
- )} -
+ )} diff --git a/src/utils/databasePicker.ts b/src/utils/databasePicker.ts new file mode 100644 index 0000000..87e3daa --- /dev/null +++ b/src/utils/databasePicker.ts @@ -0,0 +1,8 @@ +export function filterDatabases(databases: string[], search: string): string[] { + const term = search.trim().toLocaleLowerCase(); + return databases.filter(database => database.toLocaleLowerCase().includes(term)); +} + +export function moveDatabaseSelection(index: number, count: number, direction: -1 | 1): number { + return count ? (index + direction + count) % count : 0; +}