CodeCow/roapi
1
0
Fork 0
mirror of https://github.com/roapi/roapi.git synced 2026-06-05 21:04:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(postgres): ignore non-select queries (#252)

Browse Source
This commit is contained in:
QP Hou 2023-01-28 18:59:34 -08:00 committed by GitHub
parent 2c128c8f7f
commit 90e79dc7f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -934,7 +934,7 @@ dependencies = [
[[package]]
name = "columnq"
version = "0.5.0"
version = "0.6.0"
dependencies = [
"anyhow",
"arrow-schema",

2
columnq/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "columnq"
version = "0.5.0"
version = "0.6.0"
homepage = "https://github.com/roapi/roapi"
license = "MIT"
authors = ["QP Hou <dave2008713@gmail.com>"]

25
roapi/src/server/postgres.rs
View File

@ -42,6 +42,12 @@ pub struct RoapiContextEngine<H: RoapiContext> {
pub ctx: Arc<H>,
}
impl<H: RoapiContext> RoapiContextEngine<H> {
fn ignored_statement(statement: &Statement) -> bool {
!matches!(statement, Statement::Query { .. })
}
}
#[async_trait]
impl<H: RoapiContext> Engine for RoapiContextEngine<H> {
type PortalType = DataFusionPortal;
@ -50,6 +56,9 @@ impl<H: RoapiContext> Engine for RoapiContextEngine<H> {
&mut self,
statement: &Statement,
) -> Result<Vec<FieldDescription>, ErrorResponse> {
if RoapiContextEngine::<H>::ignored_statement(statement) {
return Ok(vec![]);
}
let query = statement.to_string();
info!("preparing query: {}", &query);
let df = self.ctx.sql_to_df(&query).await.map_err(df_err_to_sql)?;
@ -60,9 +69,19 @@ impl<H: RoapiContext> Engine for RoapiContextEngine<H> {
&mut self,
statement: &Statement,
) -> Result<Self::PortalType, ErrorResponse> {
let query = statement.to_string();
let df = self.ctx.sql_to_df(&query).await.map_err(df_err_to_sql)?;
Ok(DataFusionPortal { df })
if RoapiContextEngine::<H>::ignored_statement(statement) {
Ok(DataFusionPortal {
df: self
.ctx
.sql_to_df("SELECT 1 WHERE 1 = 2")
.await
.map_err(df_err_to_sql)?,
})
} else {
let query = statement.to_string();
let df = self.ctx.sql_to_df(&query).await.map_err(df_err_to_sql)?;
Ok(DataFusionPortal { df })
}
}
}