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
9 changes: 8 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,16 @@ repository = "https://github.com/prisma/tiberius"
version = "0.12.3"

[workspace]
members = ["runtimes-macro"]
members = ["runtimes-macro", "tvp-macro"]

[[test]]
path = "tests/query.rs"
name = "query"

[[test]]
path = "tests/command.rs"
name = "command"

[[test]]
path = "tests/named-instance-async.rs"
name = "named-instance-async"
Expand Down Expand Up @@ -162,6 +166,9 @@ version = "1"
[dev-dependencies.runtimes-macro]
path = "./runtimes-macro"

[dependencies.tvp-macro]
path = "./tvp-macro"

[dev-dependencies]
names = "0.14"
anyhow = "1"
Expand Down
60 changes: 56 additions & 4 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pub use auth::*;
pub use config::*;
pub(crate) use connection::*;

use crate::tds::codec::{MetaDataColumn, RpcValue};
use crate::tds::stream::ReceivedToken;
use crate::{
result::ExecuteResult,
Expand Down Expand Up @@ -357,12 +358,12 @@ impl<S: AsyncRead + AsyncWrite + Unpin + Send> Client<S> {
RpcParam {
name: Cow::Borrowed("stmt"),
flags: BitFlags::empty(),
value: ColumnData::String(Some(query.into())),
value: RpcValue::Scalar(ColumnData::String(Some(query.into()))),
},
RpcParam {
name: Cow::Borrowed("params"),
flags: BitFlags::empty(),
value: ColumnData::I32(Some(0)),
value: RpcValue::Scalar(ColumnData::I32(Some(0))),
},
]
}
Expand All @@ -388,12 +389,12 @@ impl<S: AsyncRead + AsyncWrite + Unpin + Send> Client<S> {
rpc_params.push(RpcParam {
name: Cow::Owned(format!("@P{}", i + 1)),
flags: BitFlags::empty(),
value: param,
value: RpcValue::Scalar(param),
});
}

if let Some(params) = rpc_params.iter_mut().find(|x| x.name == "params") {
params.value = ColumnData::String(Some(param_str.into()));
params.value = RpcValue::Scalar(ColumnData::String(Some(param_str.into())));
}

let req = TokenRpcRequest::new(
Expand All @@ -407,4 +408,55 @@ impl<S: AsyncRead + AsyncWrite + Unpin + Send> Client<S> {

Ok(())
}

/// Sends a named-procedure RPC request with the given parameters. The caller
/// is responsible for flushing the connection beforehand and for consuming
/// the resulting token stream.
pub(crate) async fn rpc_run_command<'a, 'b>(
&'a mut self,
command_name: Cow<'b, str>,
rpc_params: Vec<RpcParam<'b>>,
) -> crate::Result<()>
where
'a: 'b,
{
let req = TokenRpcRequest::new(
command_name,
rpc_params,
self.connection.context().transaction_descriptor(),
);

let id = self.connection.context_mut().next_packet_id();
self.connection.send(PacketHeader::rpc(id), req).await?;

Ok(())
}

/// Runs a batch query solely to retrieve its column metadata. Used to
/// resolve the column layout of a table-valued parameter type.
pub(crate) async fn query_run_for_metadata<'b>(
&mut self,
query: String,
) -> crate::Result<Option<Vec<MetaDataColumn<'b>>>> {
self.connection.flush_stream().await?;

let req = BatchRequest::new(query, self.connection.context().transaction_descriptor());

let id = self.connection.context_mut().next_packet_id();
self.connection.send(PacketHeader::batch(id), req).await?;

let token_stream = TokenStream::new(&mut self.connection).try_unfold();

let columns = token_stream
.try_fold(None, |mut columns, token| async move {
if let ReceivedToken::NewResultset(metadata) = token {
columns = Some(metadata.columns.clone());
};

Ok(columns)
})
.await?;

Ok(columns)
}
}
Loading
Loading