feat(duckdb): support editing view definitions
This commit is contained in:
1 parent
f184bc3055
commit
be1a2c6236
7 files changed
+312
-5
No files matched your search
@@ -14,8 +14,8 @@ use tokio_util::sync::CancellationToken;
|
||||
|
||||
use crate::db;
|
||||
use crate::db::duckdb_worker_protocol::{
|
||||
DuckDbWorkerConnectParams, DuckDbWorkerError, DuckDbWorkerExecuteParams, DuckDbWorkerMethod, DuckDbWorkerRequest,
|
||||
DuckDbWorkerResponse,
|
||||
DuckDbWorkerConnectParams, DuckDbWorkerError, DuckDbWorkerExecuteParams, DuckDbWorkerMethod,
|
||||
DuckDbWorkerObjectSourceParams, DuckDbWorkerRequest, DuckDbWorkerResponse,
|
||||
};
|
||||
use crate::models::connection::AttachedDatabaseConfig;
|
||||
use crate::storage::{normalize_duckdb_worker_max_processes, DUCKDB_WORKER_MAX_PROCESSES_DEFAULT};
|
||||
@@ -246,6 +246,20 @@ impl DuckDbWorkerClient {
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn get_object_source(
|
||||
&self,
|
||||
database: String,
|
||||
schema: String,
|
||||
name: String,
|
||||
object_type: db::ObjectSourceKind,
|
||||
) -> Result<String, String> {
|
||||
self.metadata_request(
|
||||
DuckDbWorkerMethod::GetObjectSource,
|
||||
DuckDbWorkerObjectSourceParams { database, schema, name, object_type },
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
pub async fn attach_database(&self, attached: AttachedDatabaseConfig) -> Result<(), String> {
|
||||
self.metadata_request::<serde_json::Value>(DuckDbWorkerMethod::AttachDatabase, attached).await?;
|
||||
Ok(())
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
use serde::{de::DeserializeOwned, Deserialize, Serialize};
|
||||
|
||||
use crate::models::connection::AttachedDatabaseConfig;
|
||||
use crate::types::ObjectSourceKind;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
pub struct DuckDbWorkerRequest {
|
||||
@@ -34,6 +35,7 @@ pub enum DuckDbWorkerMethod {
|
||||
ListSchemas,
|
||||
ListTables,
|
||||
ListColumns,
|
||||
GetObjectSource,
|
||||
AttachDatabase,
|
||||
Cancel,
|
||||
Shutdown,
|
||||
@@ -135,6 +137,15 @@ pub struct DuckDbWorkerColumnParams {
|
||||
pub table: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DuckDbWorkerObjectSourceParams {
|
||||
pub database: String,
|
||||
pub schema: String,
|
||||
pub name: String,
|
||||
pub object_type: ObjectSourceKind,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -178,4 +189,27 @@ mod tests {
|
||||
assert!(!parsed.ok);
|
||||
assert_eq!(parsed.error.expect("error").code, "duckdb_open_failed");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn protocol_round_trips_object_source_request() {
|
||||
let request = DuckDbWorkerRequest::new(
|
||||
"req-3",
|
||||
DuckDbWorkerMethod::GetObjectSource,
|
||||
DuckDbWorkerObjectSourceParams {
|
||||
database: "main".to_string(),
|
||||
schema: "main".to_string(),
|
||||
name: "active_orders".to_string(),
|
||||
object_type: ObjectSourceKind::View,
|
||||
},
|
||||
)
|
||||
.expect("serialize request");
|
||||
|
||||
let json = serde_json::to_string(&request).expect("request json");
|
||||
let parsed: DuckDbWorkerRequest = serde_json::from_str(&json).expect("parse request");
|
||||
let params: DuckDbWorkerObjectSourceParams = parsed.parse_params().expect("parse params");
|
||||
|
||||
assert_eq!(parsed.method, DuckDbWorkerMethod::GetObjectSource);
|
||||
assert_eq!(params.name, "active_orders");
|
||||
assert_eq!(params.object_type, ObjectSourceKind::View);
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,8 @@ use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader, Stdout};
|
||||
use crate::db;
|
||||
use crate::db::duckdb_worker_protocol::{
|
||||
DuckDbWorkerColumnParams, DuckDbWorkerConnectParams, DuckDbWorkerDatabaseParams, DuckDbWorkerError,
|
||||
DuckDbWorkerExecuteParams, DuckDbWorkerMethod, DuckDbWorkerRequest, DuckDbWorkerResponse, DuckDbWorkerTableParams,
|
||||
DuckDbWorkerExecuteParams, DuckDbWorkerMethod, DuckDbWorkerObjectSourceParams, DuckDbWorkerRequest,
|
||||
DuckDbWorkerResponse, DuckDbWorkerTableParams,
|
||||
};
|
||||
use crate::models::connection::AttachedDatabaseConfig;
|
||||
use crate::path_utils::expand_tilde;
|
||||
@@ -103,6 +104,19 @@ impl DuckDbWorkerSession {
|
||||
)
|
||||
}
|
||||
|
||||
pub fn get_object_source(&self, params: DuckDbWorkerObjectSourceParams) -> Result<String, String> {
|
||||
let connection = self.connection.as_ref().ok_or("DuckDB worker is not connected")?.clone();
|
||||
let locked = connection.lock().map_err(|e| e.to_string())?;
|
||||
crate::schema::duckdb_object_source_with_attached(
|
||||
&locked,
|
||||
¶ms.database,
|
||||
¶ms.schema,
|
||||
¶ms.name,
|
||||
¶ms.object_type,
|
||||
&self.attached_names,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn attach_database(&mut self, attached: AttachedDatabaseConfig) -> Result<(), String> {
|
||||
let connection = self.connection.as_ref().ok_or("DuckDB worker is not connected")?.clone();
|
||||
let locked = connection.lock().map_err(|e| e.to_string())?;
|
||||
@@ -182,6 +196,10 @@ impl DuckDbWorkerRuntime {
|
||||
let params = request.parse_params()?;
|
||||
Ok(DuckDbWorkerResponse::ok(request.id, session.list_columns(params)?))
|
||||
}),
|
||||
DuckDbWorkerMethod::GetObjectSource => self.handle_session_request(request, |session, request| {
|
||||
let params = request.parse_params()?;
|
||||
Ok(DuckDbWorkerResponse::ok(request.id, session.get_object_source(params)?))
|
||||
}),
|
||||
DuckDbWorkerMethod::AttachDatabase => self.handle_session_request(request, |session, request| {
|
||||
session.attach_database(request.parse_params()?)?;
|
||||
Ok(DuckDbWorkerResponse::ok_empty(request.id))
|
||||
@@ -428,6 +446,37 @@ mod tests {
|
||||
assert!(columns.iter().any(|column| column.name == "id" && column.is_primary_key));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn worker_session_reads_view_source() {
|
||||
let mut session = DuckDbWorkerSession::default();
|
||||
session
|
||||
.connect(DuckDbWorkerConnectParams {
|
||||
path: ":memory:".to_string(),
|
||||
attached_databases: Vec::new(),
|
||||
init_script: None,
|
||||
})
|
||||
.expect("connect");
|
||||
session
|
||||
.execute(DuckDbWorkerExecuteParams {
|
||||
sql: "CREATE VIEW active_orders AS SELECT 1 AS id".to_string(),
|
||||
database: None,
|
||||
max_rows: None,
|
||||
})
|
||||
.expect("create view");
|
||||
|
||||
let source = session
|
||||
.get_object_source(DuckDbWorkerObjectSourceParams {
|
||||
database: "main".to_string(),
|
||||
schema: "main".to_string(),
|
||||
name: "active_orders".to_string(),
|
||||
object_type: db::ObjectSourceKind::View,
|
||||
})
|
||||
.expect("get view source");
|
||||
|
||||
assert!(source.starts_with("CREATE VIEW"));
|
||||
assert!(source.contains("active_orders"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn worker_session_attaches_database() {
|
||||
let dir = std::env::temp_dir().join(format!("dbx-duckdb-worker-{}", uuid::Uuid::new_v4()));
|
||||
|
||||
Reference in new issue
Block a user