Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 26 additions & 3 deletions apps/tauri/src-tauri/src/commands.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::connection::{
ConnectionConfig, ConnectionError, ConnectionId, ConnectionManager, ConnectionRegistry,
SchemaObject, TableSchema,
};
use tauri::State;

Expand All @@ -20,9 +21,31 @@ pub fn db_disconnect(
}

#[tauri::command]
pub fn db_is_connected(
pub fn db_is_connected(id: ConnectionId, registry: State<'_, ConnectionRegistry>) -> bool {
registry.is_connected(&id)
}

#[tauri::command]
pub fn db_list_schemas(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
) -> bool {
registry.is_connected(&id)
) -> Result<Vec<String>, ConnectionError> {
registry.with_sqlite(&id, |s| s.list_schemas())
}

#[tauri::command]
pub fn db_list_tables(
id: ConnectionId,
registry: State<'_, ConnectionRegistry>,
) -> Result<Vec<SchemaObject>, ConnectionError> {
registry.with_sqlite(&id, |s| s.list_tables())
}

#[tauri::command]
pub fn db_list_columns(
id: ConnectionId,
table: String,
registry: State<'_, ConnectionRegistry>,
) -> Result<TableSchema, ConnectionError> {
registry.with_sqlite(&id, |s| s.list_columns(&table))
}
46 changes: 46 additions & 0 deletions apps/tauri/src-tauri/src/connection/introspect.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//! Schema introspection DTOs shared across drivers (SQLite first).

use serde::{Deserialize, Serialize};

/// Catalog object shown in the object tree.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub struct SchemaObject {
pub name: String,
pub kind: SchemaObjectKind,
/// SQLite uses `"main"`; other drivers may use real schema names.
#[serde(skip_serializing_if = "Option::is_none")]
pub schema: Option<String>,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum SchemaObjectKind {
Table,
View,
}

/// Column description for a table or view.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub struct ColumnMeta {
pub name: String,
pub data_type: String,
pub is_nullable: bool,
pub is_primary_key: bool,
#[serde(skip_serializing_if = "Option::is_none")]
pub primary_key_position: Option<i32>,
#[serde(skip_serializing_if = "Option::is_none")]
pub default_value: Option<String>,
}

/// Full table/view describe payload.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub struct TableSchema {
pub table_name: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub schema: Option<String>,
pub columns: Vec<ColumnMeta>,
pub primary_keys: Vec<String>,
}
26 changes: 26 additions & 0 deletions apps/tauri/src-tauri/src/connection/manager.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use super::error::{ConnectionError, ConnectionResult};
use super::id::{ConnectionId, DriverKind};
use super::sqlite::SqliteSession;
use serde::{Deserialize, Serialize};
use std::any::Any;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};

Expand Down Expand Up @@ -44,6 +46,8 @@ pub trait ConnectionSession: Send + Sync {
fn id(&self) -> &ConnectionId;
fn driver(&self) -> DriverKind;
fn disconnect(&mut self) -> ConnectionResult<()>;
/// Downcast hook for driver-specific APIs (introspection, query).
fn as_any(&self) -> &dyn Any;
}

/// Opens and tracks live DB sessions.
Expand Down Expand Up @@ -101,6 +105,25 @@ impl ConnectionRegistry {
.lock()
.map_err(|_| ConnectionError::io("connection registry lock poisoned"))
}

/// Run a closure against a live [`SqliteSession`].
pub fn with_sqlite<T>(
&self,
id: &ConnectionId,
f: impl FnOnce(&SqliteSession) -> ConnectionResult<T>,
) -> ConnectionResult<T> {
let map = self.lock()?;
let session = map
.get(id)
.ok_or_else(|| ConnectionError::NotFound { id: id.clone() })?;
let sqlite = session
.as_any()
.downcast_ref::<SqliteSession>()
.ok_or(ConnectionError::UnsupportedDriver {
driver: session.driver(),
})?;
f(sqlite)
}
}

impl ConnectionManager for ConnectionRegistry {
Expand Down Expand Up @@ -160,6 +183,9 @@ mod tests {
self.closed = true;
Ok(())
}
fn as_any(&self) -> &dyn Any {
self
}
}

#[test]
Expand Down
7 changes: 5 additions & 2 deletions apps/tauri/src-tauri/src/connection/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@

mod error;
mod id;
mod introspect;
mod manager;
mod sqlite;
mod sqlite_introspect;

pub use error::ConnectionError;
pub use id::{ConnectionId, DriverKind};
pub use introspect::{ColumnMeta, SchemaObject, SchemaObjectKind, TableSchema};
pub use manager::{ConnectionConfig, ConnectionManager, ConnectionRegistry};
#[allow(unused_imports)] // public API for later IPC / introspection issues
#[allow(unused_imports)] // public API for later IPC / frontend issues
pub use manager::ConnectionSession;
#[allow(unused_imports)] // public API for later IPC / introspection issues
#[allow(unused_imports)] // public API for later IPC / frontend issues
pub use sqlite::{open_sqlite, SqliteSession};
54 changes: 52 additions & 2 deletions apps/tauri/src-tauri/src/connection/sqlite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@ pub struct SqliteSession {
}

impl SqliteSession {
#[allow(dead_code)] // used by introspection / query issues next
pub fn path(&self) -> &str {
&self.path
}

#[allow(dead_code)] // used by execute_query / tree issues next
pub fn with_connection<T>(
&self,
f: impl FnOnce(&Connection) -> ConnectionResult<T>,
Expand All @@ -36,6 +34,21 @@ impl SqliteSession {
})?;
f(conn)
}

pub fn list_schemas(&self) -> ConnectionResult<Vec<String>> {
self.with_connection(super::sqlite_introspect::list_schemas)
}

pub fn list_tables(&self) -> ConnectionResult<Vec<super::introspect::SchemaObject>> {
self.with_connection(super::sqlite_introspect::list_tables)
}

pub fn list_columns(
&self,
table: &str,
) -> ConnectionResult<super::introspect::TableSchema> {
self.with_connection(|c| super::sqlite_introspect::list_columns(c, table))
}
}

impl ConnectionSession for SqliteSession {
Expand All @@ -58,6 +71,10 @@ impl ConnectionSession for SqliteSession {
}
Ok(())
}

fn as_any(&self) -> &dyn std::any::Any {
self
}
}

/// Open a SQLite database file and return a live session.
Expand Down Expand Up @@ -139,4 +156,37 @@ mod tests {
assert!(!reg.is_connected(&id));
let _ = std::fs::remove_file(&path);
}

#[test]
fn registry_introspect_fixture() {
let path = temp_db();
let path_str = path.to_string_lossy().to_string();
{
let conn = Connection::open(&path).unwrap();
conn.execute_batch(
"CREATE TABLE t (id INTEGER PRIMARY KEY, name TEXT NOT NULL);",
)
.unwrap();
}
let reg = ConnectionRegistry::with_builtin_drivers();
let id = reg
.connect(ConnectionConfig::Sqlite {
path: path_str,
})
.expect("connect");
let schemas = reg
.with_sqlite(&id, |s| s.list_schemas())
.expect("schemas");
assert_eq!(schemas, vec!["main".to_string()]);
let tables = reg.with_sqlite(&id, |s| s.list_tables()).expect("tables");
assert_eq!(tables.len(), 1);
assert_eq!(tables[0].name, "t");
let cols = reg
.with_sqlite(&id, |s| s.list_columns("t"))
.expect("columns");
assert_eq!(cols.primary_keys, vec!["id".to_string()]);
assert_eq!(cols.columns.len(), 2);
reg.disconnect(&id).unwrap();
let _ = std::fs::remove_file(&path);
}
}
Loading
Loading