Skip to content

fix: connection auto-reconnect, executable top-N SQL, and context-menu UX fixes #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Blankll merged 9 commits into from
Aug 6, 2026
Merged

fix: connection auto-reconnect, executable top-N SQL, and context-menu UX fixes #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3623ac4
fix(connection): transparently reconnect lost or evicted sessions
Blankll Aug 5, 2026
b68dcd2
fix(queries): generate executable top-N SQL per database dialect
Blankll Aug 5, 2026
5f6b14e
feat(sidebar): database context menu + dismiss menus on outside click
Blankll Aug 5, 2026
0751f7e
feat(connections): add disconnect action to connected connection cards
Blankll Aug 5, 2026
17fd74c
fix(data-view): scrollable edit dialogs for wide tables
Blankll Aug 5, 2026
efbd31f
fix(connections): label the action 'Close Connection' instead of 'Dis…
Blankll Aug 5, 2026
73d5faa
feat(connections): toggle connect button label/icon by connection state
Blankll Aug 5, 2026
000d1be
feat(connections): primary button opens editor when connected
Blankll Aug 5, 2026
09aef42
fix(connections): use power icon for close connection action
Blankll Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src-tauri/src/capabilities/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ fn to_metadata(cap: &Capability) -> Value {

async fn resolve_connection_config(app: &AppHandle, connection_id: &str) -> Result<Value, String> {
let state: tauri::State<'_, crate::state::AppState> = app.state();
let conns = state.connections.read().await;
let _active = conns
.get(connection_id)
.ok_or_else(|| format!("Connection not found: {}", connection_id))?;
state.ensure_connection(connection_id).await?;

Ok(json!({ "connectionId": connection_id }))
}
4 changes: 2 additions & 2 deletions src-tauri/src/capabilities/sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ async fn resolve_adapter(connection_id: &str) -> Result<ActiveConnection, String
// Store the adapter for future use
{
let state: tauri::State<'_, crate::state::AppState> = app.state();
let mut conns = state.connections.write().await;
conns.insert(connection_id.to_string(), adapter.clone());
state.connections.write().await.insert(connection_id.to_string(), adapter.clone());
state.configs.write().await.insert(connection_id.to_string(), server_config);
}

Ok(adapter)
Expand Down
161 changes: 22 additions & 139 deletions src-tauri/src/commands/browse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,7 @@ pub async fn list_databases(
connection_id: String,
state: State<'_, AppState>,
) -> Result<Vec<DatabaseSchema>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;
let databases = connection
.list_databases()
.await
Expand All @@ -179,13 +173,7 @@ pub async fn list_schemas(
database: String,
state: State<'_, AppState>,
) -> Result<Vec<String>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let schemas = connection
.list_schemas(Some(&database))
Expand Down Expand Up @@ -214,13 +202,7 @@ pub async fn list_tables(
schema: Option<String>,
state: State<'_, AppState>,
) -> Result<Vec<TableInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let tables = connection
.list_tables(Some(&database), schema.as_deref())
Expand Down Expand Up @@ -251,13 +233,7 @@ pub async fn get_table_info(
table_name: String,
state: State<'_, AppState>,
) -> Result<TableInfo, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let table_info = connection
.get_table_info(Some(&database), schema.as_deref(), &table_name)
Expand All @@ -276,13 +252,7 @@ pub async fn list_columns(
table_name: String,
state: State<'_, AppState>,
) -> Result<Vec<ColumnInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let columns = match &connection {
ActiveConnection::Postgres(adapter) => {
Expand Down Expand Up @@ -344,13 +314,7 @@ pub async fn get_foreign_keys(
schema: Option<String>,
state: State<'_, AppState>,
) -> Result<Vec<ForeignKeyInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let result = connection
.get_foreign_keys(Some(&database), schema.as_deref())
Expand All @@ -377,13 +341,7 @@ pub async fn get_table_data(
query: TableDataQuery,
state: State<'_, AppState>,
) -> Result<QueryResult, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let limit_val = query.limit.unwrap_or(100);
let offset_val = query.offset.unwrap_or(0);
Expand Down Expand Up @@ -510,13 +468,7 @@ pub async fn get_table_count(
filter: Option<String>,
state: State<'_, AppState>,
) -> Result<u64, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let filter_ref = filter.as_deref();
let db_type = get_db_type_string(&connection);
Expand Down Expand Up @@ -685,13 +637,7 @@ pub async fn update_table_row(
return Ok(());
}

let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let db_type = get_db_type_string(&connection);

Expand Down Expand Up @@ -823,13 +769,7 @@ pub async fn delete_table_row(
return Err("Cannot delete row: no primary key values provided".to_string());
}

let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

let db_type = get_db_type_string(&connection);

Expand Down Expand Up @@ -930,13 +870,7 @@ pub async fn list_views(
schema: Option<String>,
state: State<'_, AppState>,
) -> Result<Vec<ObjectInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.list_views(Some(&database), schema.as_deref())
Expand All @@ -952,13 +886,7 @@ pub async fn list_procedures(
schema: Option<String>,
state: State<'_, AppState>,
) -> Result<Vec<ObjectInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.list_procedures(Some(&database), schema.as_deref())
Expand All @@ -974,13 +902,7 @@ pub async fn list_functions(
schema: Option<String>,
state: State<'_, AppState>,
) -> Result<Vec<ObjectInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.list_functions(Some(&database), schema.as_deref())
Expand All @@ -997,13 +919,7 @@ pub async fn list_triggers(
table: String,
state: State<'_, AppState>,
) -> Result<Vec<TriggerInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.list_triggers(Some(&database), schema.as_deref(), &table)
Expand All @@ -1020,13 +936,7 @@ pub async fn list_indexes(
table: String,
state: State<'_, AppState>,
) -> Result<Vec<IndexInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.list_indexes(Some(&database), schema.as_deref(), &table)
Expand All @@ -1043,13 +953,7 @@ pub async fn list_foreign_keys(
table: String,
state: State<'_, AppState>,
) -> Result<Vec<ForeignKeyInfo>, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.list_foreign_keys_for_table(Some(&database), schema.as_deref(), &table)
Expand All @@ -1067,13 +971,7 @@ pub async fn get_object_ddl(
object_type: String,
state: State<'_, AppState>,
) -> Result<String, String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.get_object_ddl(
Expand All @@ -1096,13 +994,7 @@ pub async fn drop_object(
object_type: String,
state: State<'_, AppState>,
) -> Result<(), String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.drop_object(
Expand All @@ -1126,13 +1018,7 @@ pub async fn rename_object(
new_name: String,
state: State<'_, AppState>,
) -> Result<(), String> {
let connection = {
let connections = state.connections.read().await;
connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?
.clone()
};
let connection = state.ensure_connection(&connection_id).await?;

connection
.rename_object(
Expand Down Expand Up @@ -1205,14 +1091,11 @@ pub async fn build_table_search_filter(
search_term: String,
state: State<'_, AppState>,
) -> Result<String, String> {
let connections = state.connections.read().await;
let connection = connections
.get(&connection_id)
.ok_or_else(|| format!("No active connection found for ID '{}'", connection_id))?;
let connection = state.ensure_connection(&connection_id).await?;

let db_type = get_db_type_string(connection);
let db_type = get_db_type_string(&connection);

let columns = match connection {
let columns = match &connection {
ActiveConnection::Postgres(adapter) => {
let adapter = adapter.lock().await;
if Some(database.as_str()) != adapter.config.database.as_deref() {
Expand Down
4 changes: 4 additions & 0 deletions src-tauri/src/commands/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ pub async fn connect_server(
let mut connections = state.connections.write().await;
connections.insert(id.clone(), connection.clone());
drop(connections);
// Keep the config so a lost session can be transparently recreated later.
state.configs.write().await.insert(id.clone(), config);
let status = connection
.test_connection()
.await
Expand All @@ -46,6 +48,8 @@ pub async fn disconnect_server(id: String, state: State<'_, AppState>) -> Result
.remove(&id)
.ok_or_else(|| format!("No active connection found for server '{}'", id))?;

state.configs.write().await.remove(&id);

let disconnect_result = connection.disconnect().await;

if let Err(e) = disconnect_result {
Expand Down
Loading
Loading