From 71772cc6e3320216f7077bdb89b1d4585fdbbbf9 Mon Sep 17 00:00:00 2001 From: ZhuchkaTriplesix Date: Sun, 15 Nov 2026 12:08:47 +0300 Subject: [PATCH] feat(ui): SQLite Overview like Flutter + Glide columns fill width (#1968) Add db_sqlite_overview (version/size/pages/journal) and restyle Connection home chips + tables card. Size Glide columns by content and set grow so spare viewport width fills the grid. --- apps/tauri/src-tauri/src/commands.rs | 11 +- apps/tauri/src-tauri/src/connection/mod.rs | 1 + apps/tauri/src-tauri/src/connection/sqlite.rs | 9 + .../src/connection/sqlite_introspect.rs | 55 +++ apps/tauri/src-tauri/src/lib.rs | 5 +- apps/tauri/src/api/connection.ts | 14 + apps/tauri/src/ui/ConnectionHome.vue | 436 +++++++++++++----- apps/tauri/src/ui/glide/ResultDataEditor.ts | 19 +- apps/tauri/src/ui/glide/columnWidths.test.ts | 26 ++ apps/tauri/src/ui/glide/columnWidths.ts | 52 +++ 10 files changed, 504 insertions(+), 124 deletions(-) create mode 100644 apps/tauri/src/ui/glide/columnWidths.test.ts create mode 100644 apps/tauri/src/ui/glide/columnWidths.ts diff --git a/apps/tauri/src-tauri/src/commands.rs b/apps/tauri/src-tauri/src/commands.rs index c4847246..61d41b52 100644 --- a/apps/tauri/src-tauri/src/commands.rs +++ b/apps/tauri/src-tauri/src/commands.rs @@ -1,6 +1,6 @@ use crate::connection::{ ConnectionConfig, ConnectionError, ConnectionId, ConnectionManager, ConnectionRegistry, - SchemaObject, SchemaObjectKind, SqlObjectKind, SqlObjectNode, TableSchema, + SchemaObject, SchemaObjectKind, SqlObjectKind, SqlObjectNode, SqliteOverview, TableSchema, }; use tauri::ipc::Channel; use tauri::State; @@ -98,6 +98,15 @@ pub fn db_list_columns( registry.with_sqlite(&id, |s| s.list_columns(&table)) } +/// SQLite Overview / Database Info (Flutter `SqliteOverviewTab`). +#[tauri::command] +pub fn db_sqlite_overview( + id: ConnectionId, + registry: State<'_, ConnectionRegistry>, +) -> Result { + registry.with_sqlite(&id, |s| s.database_overview()) +} + /// Execute SQL and stream `QueryEvent` batches over `on_event`. /// Failures return as the invoke `Err` only (no dual channel `Error` event). #[tauri::command] diff --git a/apps/tauri/src-tauri/src/connection/mod.rs b/apps/tauri/src-tauri/src/connection/mod.rs index 2cd49f37..cfe07158 100644 --- a/apps/tauri/src-tauri/src/connection/mod.rs +++ b/apps/tauri/src-tauri/src/connection/mod.rs @@ -18,3 +18,4 @@ pub use introspect::{ColumnMeta, SchemaObject, SchemaObjectKind, TableSchema}; pub use manager::{ConnectionConfig, ConnectionManager, ConnectionRegistry}; pub use object_tree::{ObjectTreeProvider, SqlObjectKind, SqlObjectNode}; pub use query::QueryEvent; +pub use sqlite_introspect::SqliteOverview; diff --git a/apps/tauri/src-tauri/src/connection/sqlite.rs b/apps/tauri/src-tauri/src/connection/sqlite.rs index 6d84b43b..2ec6ad46 100644 --- a/apps/tauri/src-tauri/src/connection/sqlite.rs +++ b/apps/tauri/src-tauri/src/connection/sqlite.rs @@ -61,6 +61,15 @@ impl SqliteSession { self.with_connection(|c| super::sqlite_introspect::list_columns(c, table)) } + /// Flutter `databaseOverview` for the Overview / Database Info tab. + pub fn database_overview( + &self, + ) -> ConnectionResult { + self.with_connection(|c| { + super::sqlite_introspect::database_overview(c, &self.path) + }) + } + pub fn execute_streaming( &self, sql: &str, diff --git a/apps/tauri/src-tauri/src/connection/sqlite_introspect.rs b/apps/tauri/src-tauri/src/connection/sqlite_introspect.rs index f0a6cdab..fb0bc10d 100644 --- a/apps/tauri/src-tauri/src/connection/sqlite_introspect.rs +++ b/apps/tauri/src-tauri/src/connection/sqlite_introspect.rs @@ -4,6 +4,61 @@ use super::error::{ConnectionError, ConnectionResult}; use super::id::DriverKind; use super::introspect::{ColumnMeta, SchemaObject, SchemaObjectKind, TableSchema}; use rusqlite::Connection; +use serde::Serialize; + +/// Flutter `SqliteConnection.databaseOverview` (+ on-disk file size). +#[derive(Debug, Clone, Serialize)] +pub struct SqliteOverview { + pub version: String, + pub page_count: i64, + pub page_size: i64, + pub journal_mode: String, + pub table_count: i64, + #[serde(skip_serializing_if = "Option::is_none")] + pub file_size_bytes: Option, +} + +pub fn database_overview( + conn: &Connection, + path: &str, +) -> ConnectionResult { + let version: String = conn + .query_row("SELECT sqlite_version()", [], |r| r.get(0)) + .unwrap_or_default(); + let page_count: i64 = conn + .query_row("PRAGMA page_count", [], |r| r.get(0)) + .unwrap_or(0); + let page_size: i64 = conn + .query_row("PRAGMA page_size", [], |r| r.get(0)) + .unwrap_or(0); + let journal_mode: String = conn + .query_row("PRAGMA journal_mode", [], |r| r.get::<_, String>(0)) + .map(|s| s.to_uppercase()) + .unwrap_or_else(|_| "—".into()); + let table_count: i64 = conn + .query_row( + "SELECT count(*) FROM sqlite_master \ + WHERE type='table' AND name NOT LIKE 'sqlite_%'", + [], + |r| r.get(0), + ) + .unwrap_or(0); + + let file_size_bytes = if path.is_empty() || path == ":memory:" { + None + } else { + std::fs::metadata(path).ok().map(|m| m.len()) + }; + + Ok(SqliteOverview { + version, + page_count, + page_size, + journal_mode, + table_count, + file_size_bytes, + }) +} /// SQLite has no real schemas; expose the default attached DB name. pub fn list_schemas(_conn: &Connection) -> ConnectionResult> { diff --git a/apps/tauri/src-tauri/src/lib.rs b/apps/tauri/src-tauri/src/lib.rs index 381317d9..9f70eb0b 100644 --- a/apps/tauri/src-tauri/src/lib.rs +++ b/apps/tauri/src-tauri/src/lib.rs @@ -4,12 +4,12 @@ mod connection; pub use connection::{ ColumnMeta, ConnectionConfig, ConnectionError, ConnectionId, ConnectionManager, ConnectionRegistry, DriverKind, ObjectTreeProvider, QueryEvent, SchemaObject, SchemaObjectKind, - SqlObjectKind, SqlObjectNode, TableSchema, + SqlObjectKind, SqlObjectNode, SqliteOverview, TableSchema, }; use commands::{ db_connect_sqlite, db_describe_object, db_disconnect, db_execute_query, db_is_connected, - db_list_children, db_list_columns, db_list_schemas, db_list_tables, + db_list_children, db_list_columns, db_list_schemas, db_list_tables, db_sqlite_overview, }; #[tauri::command] @@ -50,6 +50,7 @@ pub fn run() { db_list_columns, db_list_children, db_describe_object, + db_sqlite_overview, db_execute_query, ]) .run(tauri::generate_context!()) diff --git a/apps/tauri/src/api/connection.ts b/apps/tauri/src/api/connection.ts index 3e829800..a025e39c 100644 --- a/apps/tauri/src/api/connection.ts +++ b/apps/tauri/src/api/connection.ts @@ -88,6 +88,20 @@ export async function dbListColumns( return invoke("db_list_columns", { id, table }); } +/** Flutter `SqliteConnection.databaseOverview`. */ +export type SqliteOverview = { + version: string; + page_count: number; + page_size: number; + journal_mode: string; + table_count: number; + file_size_bytes?: number | null; +}; + +export async function dbSqliteOverview(id: string): Promise { + return invoke("db_sqlite_overview", { id }); +} + export function formatConnectionError(err: unknown): string { if (typeof err === "string") return err; if (err && typeof err === "object") { diff --git a/apps/tauri/src/ui/ConnectionHome.vue b/apps/tauri/src/ui/ConnectionHome.vue index 511995c6..544c23b5 100644 --- a/apps/tauri/src/ui/ConnectionHome.vue +++ b/apps/tauri/src/ui/ConnectionHome.vue @@ -1,9 +1,15 @@