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
107 changes: 99 additions & 8 deletions apps/tauri/src-tauri/Cargo.lock

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

3 changes: 3 additions & 0 deletions apps/tauri/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ sqlx = { version = "0.8", default-features = false, features = [
"postgres",
"json",
"chrono",
"rust_decimal",
"uuid",
] }
futures-util = "0.3"
chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
keyring = { version = "3", features = ["apple-native", "windows-native", "linux-native-sync-persistent"] }
sqlparser = "0.64"
rust_decimal = { version = "1", features = ["serde"] }

[profile.release]
codegen-units = 1
Expand Down
11 changes: 7 additions & 4 deletions apps/tauri/src-tauri/src/connection/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ pub enum ConnectionError {
UnsupportedDriver { driver: DriverKind },
Io { message: String },
Driver { driver: DriverKind, message: String },
/// sqlparser / product SQL guard refusal (`rule` is a stable id).
SqlGuard { rule: String, message: String },
/// sqlparser / product SQL guard refusal (typed `rule` for UI branching).
SqlGuard {
rule: super::sql_guard::SqlGuardRule,
message: String,
},
}

impl ConnectionError {
Expand Down Expand Up @@ -42,7 +45,7 @@ impl ConnectionError {
message: impl Into<String>,
) -> Self {
Self::SqlGuard {
rule: rule.as_str().to_owned(),
rule,
message: message.into(),
}
}
Expand All @@ -63,7 +66,7 @@ impl fmt::Display for ConnectionError {
write!(f, "{driver} error: {message}")
}
Self::SqlGuard { rule, message } => {
write!(f, "sql guard ({rule}): {message}")
write!(f, "sql guard ({}): {message}", rule.as_str())
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/tauri/src-tauri/src/connection/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ mod tests {
.unwrap_err();
match err {
ConnectionError::SqlGuard { rule, .. } => {
assert_eq!(rule, "single_statement");
assert_eq!(rule.as_str(), "single_statement");
}
other => panic!("expected SqlGuard, got {other:?}"),
}
Expand Down
Loading
Loading