Skip to content

Support "insert into" queries in SimpleQueryHandler #67

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
merged 3 commits into from
Apr 15, 2025
Merged

Support "insert into" queries in SimpleQueryHandler #67

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dcb532
support insert into queries in SimpleQueryHandler
tonyalaribe Apr 14, 2025
ff70bc3
expect a count column in inserts and return that count
tonyalaribe Apr 14, 2025
fbd8b51
run cargo fmt
tonyalaribe Apr 15, 2025
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
32 changes: 29 additions & 3 deletions datafusion-postgres/src/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use pgwire::api::auth::noop::NoopStartupHandler;
use pgwire::api::copy::NoopCopyHandler;
use pgwire::api::portal::{Format, Portal};
use pgwire::api::query::{ExtendedQueryHandler, SimpleQueryHandler};
use pgwire::api::results::{DescribePortalResponse, DescribeStatementResponse, Response};
use pgwire::api::results::{DescribePortalResponse, DescribeStatementResponse, Response, Tag};
use pgwire::api::stmt::QueryParser;
use pgwire::api::stmt::StoredStatement;
use pgwire::api::{ClientInfo, NoopErrorHandler, PgWireServerHandlers, Type};
Expand Down Expand Up @@ -83,8 +83,34 @@ impl SimpleQueryHandler for DfSessionService {
.await
.map_err(|e| PgWireError::ApiError(Box::new(e)))?;

let resp = datatypes::encode_dataframe(df, &Format::UnifiedText).await?;
Ok(vec![Response::Query(resp)])
let query_lower = query.to_lowercase();
if query_lower.starts_with("insert into") {
// For INSERT queries, we need to execute the query to get the row count
// and return an Execution response with the proper tag
let result = df
.clone()
.collect()
.await
.map_err(|e| PgWireError::ApiError(Box::new(e)))?;

// Extract count field from the first batch
let rows_affected = result
.first()
.and_then(|batch| batch.column_by_name("count"))
.and_then(|col| {
col.as_any()
.downcast_ref::<datafusion::arrow::array::UInt64Array>()
})
.map_or(0, |array| array.value(0) as usize);

// Create INSERT tag with the affected row count
let tag = Tag::new("INSERT").with_oid(0).with_rows(rows_affected);
Ok(vec![Response::Execution(tag)])
} else {
// For non-INSERT queries, return a regular Query response
let resp = datatypes::encode_dataframe(df, &Format::UnifiedText).await?;
Ok(vec![Response::Query(resp)])
}
}
}

Expand Down
Loading