Skip to content

[pull] trunk from spiceai:trunk #43

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
pull merged 2 commits into from
Apr 22, 2025
Merged

[pull] trunk from spiceai:trunk #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fa96f2
Allow parameter queries with no parameters (#5481)
kczimm Apr 22, 2025
6e0658a
Support unparsing UNION for distinct results (#5483)
phillipleblanc Apr 22, 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
44 changes: 22 additions & 22 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ uuid = "1"
x509-certificate = "0.23.1"

[patch.crates-io]
datafusion = { git = "https://github.com/spiceai/datafusion.git", rev = "e0e423e9e29a711d076892865d51747b06429d1b" } # spiceai-45
datafusion-common = { git = "https://github.com/spiceai/datafusion.git", rev = "e0e423e9e29a711d076892865d51747b06429d1b" } # spiceai-45
datafusion-execution = { git = "https://github.com/spiceai/datafusion.git", rev = "e0e423e9e29a711d076892865d51747b06429d1b" } # spiceai-45
datafusion-expr = { git = "https://github.com/spiceai/datafusion.git", rev = "e0e423e9e29a711d076892865d51747b06429d1b" } # spiceai-45
datafusion = { git = "https://github.com/spiceai/datafusion.git", rev = "bfde649a9622d1a89172a1ba08b7a66945a030d5" } # spiceai-45
datafusion-common = { git = "https://github.com/spiceai/datafusion.git", rev = "bfde649a9622d1a89172a1ba08b7a66945a030d5" } # spiceai-45
datafusion-execution = { git = "https://github.com/spiceai/datafusion.git", rev = "bfde649a9622d1a89172a1ba08b7a66945a030d5" } # spiceai-45
datafusion-expr = { git = "https://github.com/spiceai/datafusion.git", rev = "bfde649a9622d1a89172a1ba08b7a66945a030d5" } # spiceai-45

datafusion-federation = { git = "https://github.com/spiceai/datafusion-federation.git", rev = "1c814422cfbdeb7f7bd2399e3369656710413aa8" } # spiceai-45
datafusion-table-providers = { git = "https://github.com/datafusion-contrib/datafusion-table-providers.git", rev = "1713e9af2729f686aac46aef63e8c84545083e29" } # spiceai
Expand Down
9 changes: 6 additions & 3 deletions crates/runtime/src/flight/flightsql/prepared_statement_query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use arrow_flight::{
use arrow_ipc::{reader::StreamReader, writer::StreamWriter};
use arrow_schema::SchemaRef;
use arrow_tools::record_batch::record_to_param_values;
use bytes::Bytes;
use datafusion::{
common::ParamValues,
sql::sqlparser::{
Expand Down Expand Up @@ -71,9 +72,11 @@ pub(crate) async fn do_action_create_prepared_statement(
.map_err(to_tonic_err)?;

let dataset_schema = Service::serialize_schema(&dataset_schema)?;
let parameter_schema = Service::serialize_schema(
&parameter_schema.ok_or(Status::internal("no parameter schema"))?,
)?;
let parameter_schema = if let Some(schema) = &parameter_schema {
Service::serialize_schema(schema)?
} else {
Bytes::default()
};

let stmt = PreparedStatement {
query: query.to_string(),
Expand Down
Loading