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
1 change: 1 addition & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions pgdog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ azure_core = "0.34.0"
crc32c = "0.6.8"
bit-vec = "0.8"
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls-webpki-roots-no-provider"] }
hex = "0.4"

[target.'cfg(unix)'.dependencies]
libc = "0.2"
Expand Down
3 changes: 3 additions & 0 deletions pgdog/src/frontend/router/parser/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ pub enum Error {
#[error("missing parameter: ${0}")]
MissingParameter(usize),

#[error("expected parameter ${0} to be an integer, got \'{1}\' instead")]
ParameterNotInteger(usize, String),

#[error("column has no associated table")]
ColumnNoTable,

Expand Down
13 changes: 7 additions & 6 deletions pgdog/src/frontend/router/parser/limit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,13 @@ impl<'a> LimitClause<'a> {
if param.is_null() {
Ok(None)
} else {
Ok(Some(
param
.bigint()
.ok_or(Error::MissingParameter(*number as usize))?
as usize,
))
match param.bigint() {
Some(param) => Ok(Some(param as usize)),
None => Err(Error::ParameterNotInteger(
*number as usize,
param.text_debug(),
)),
}
}
} else {
Ok(None)
Expand Down
39 changes: 39 additions & 0 deletions pgdog/src/frontend/router/parser/query/test/test_select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,45 @@ fn test_limit_offset_with_params() {
assert_eq!(route.limit().offset, Some(25));
}

#[test]
fn test_limit_offset_with_bad_params() {
let mut test = QueryParserTest::new();

let command = test.try_execute(vec![
Parse::named("__test_limit", "SELECT * FROM users LIMIT $1 OFFSET $2").into(),
Bind::new_params(
"__test_limit",
&[Parameter::new(b"apples"), Parameter::new(b"25")],
)
.into(),
Execute::new().into(),
Sync.into(),
]);

let err = command.err().expect("limit should fail");
assert_eq!(
err.to_string(),
"expected parameter $1 to be an integer, got 'apples' instead"
);

let command = test.try_execute(vec![
Parse::named("__test_limit", "SELECT * FROM users LIMIT $1 OFFSET $2").into(),
Bind::new_params(
"__test_limit",
&[Parameter::new(b"25"), Parameter::new(b"oranges")],
)
.into(),
Execute::new().into(),
Sync.into(),
]);

let err = command.err().expect("offset should fail");
assert_eq!(
err.to_string(),
"expected parameter $2 to be an integer, got 'oranges' instead"
);
}

#[test]
fn test_distinct_row() {
let mut test = QueryParserTest::new();
Expand Down
9 changes: 9 additions & 0 deletions pgdog/src/net/messages/bind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ impl<'a> ParameterWithFormat<'a> {
from_utf8(&self.parameter.data).ok()
}

/// Get the parameter as a textual value for debugging purposes only.
pub fn text_debug(&self) -> String {
if let Some(text) = self.text() {
text.to_string()
} else {
hex::encode(self.data())
}
}

/// Get BIGINT if one is encoded in the field.
pub fn bigint(&self) -> Option<i64> {
Self::decode(self)
Expand Down
Loading