Skip to content
Open
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

- **Database errors logged at debug level**: errors that PostgreSQL returns to a client are now logged concisely at `debug` level (`CS_LOG__PROTOCOL_LEVEL=debug` shows them), instead of in full at `error` level. Errors that Proxy itself generates are still logged.

- **Minimum supported Rust version**: building Proxy from source now requires Rust 1.89.0 or later, declared as `rust-version` in `Cargo.toml` so Cargo reports an older compiler clearly instead of failing deep in a dependency. CI builds the production binary on Rust 1.89.0 to keep that minimum from rising by accident. Development, tests, and release binaries use the Rust version pinned in `rust-toolchain.toml` (currently 1.99.0). See [Supported Rust versions](DEVELOPMENT.md#supported-rust-versions).
- **Minimum supported Rust version**: building Proxy from source now requires Rust 1.89.0 or later, declared as `rust-version` in `Cargo.toml` so Cargo reports an older compiler clearly instead of failing deep in a dependency. CI builds the production binary on Rust 1.89.0 to keep that minimum from rising by accident. Development, tests, and release binaries use the Rust version pinned in `rust-toolchain.toml` (currently 1.100.0). See [Supported Rust versions](DEVELOPMENT.md#supported-rust-versions).

- **PostgreSQL execution lifecycle ownership**: Proxy now tracks prepared statements, portals, Describe operations, execution outcomes, and execution metrics as one connection-local protocol lifecycle. Suspended executions retain their original metrics scope until completion, repeated portal executions receive distinct scopes, and terminal errors replace upstream responses atomically while schema outcomes are reported exactly once.

Expand Down
1 change: 0 additions & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ CI uses three Rust toolchains:

| Toolchain | Declared in | What CI runs on it |
|---|---|---|
| **Pinned** (currently 1.99.0) | `rust-toolchain.toml` | Formatting, Clippy, unit and integration tests across the full PostgreSQL matrix, burn-in, benchmarks, and release binaries (`mise run build:binary`). |
| **Pinned** (currently 1.100.0) | `rust-toolchain.toml` | Formatting, Clippy, unit and integration tests across the full PostgreSQL matrix, burn-in, benchmarks, and release binaries (`mise run build:binary`). |
| **Latest stable** | floating `stable` channel | `Lint (Rust stable)`: formatting and Clippy only. |
| **Minimum supported (MSRV)** (currently 1.89.0) | `rust-version` under `[workspace.package]` in `Cargo.toml` | `Build (Rust MSRV)`: builds the production binary with `cargo build --locked --release --package cipherstash-proxy`. |

Expand Down
3 changes: 0 additions & 3 deletions packages/cipherstash-proxy/src/proxy/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@ impl Proxy {
}
}

// async_trait adds must_use to its generated methods. Clippy on Rust 1.99
// reports these annotations as redundant because Future is already must_use.
#[allow(clippy::double_must_use)]
#[async_trait::async_trait]
pub trait EncryptionService: Send + Sync {
/// Encrypt plaintexts for storage in the database
Expand Down
2 changes: 1 addition & 1 deletion packages/eql-mapper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ impl-trait-for-tuples = "0.2.3"
sqltk = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
topological-sort = "0.2.2"

[dev-dependencies]
pretty_assertions = "^1.0"
tracing-subscriber = { workspace = true }
6 changes: 1 addition & 5 deletions packages/eql-mapper/src/inference/type_error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,7 @@ pub enum TypeError {
/// This is a refusal, not a coverage gap: serving the statement would mean
/// treating the column as plaintext.
#[error(
"Column `{}.{}` is declared as `{}`, which this build of CipherStash Proxy cannot encrypt or decrypt. Statements referencing `{}` are refused so that plaintext is never written to it. Migrate the column to an EQL v3 domain type.",
table,
column,
column_type,
table
"Column `{table}.{column}` is declared as `{column_type}`, which this build of CipherStash Proxy cannot encrypt or decrypt. Statements referencing `{table}` are refused so that plaintext is never written to it. Migrate the column to an EQL v3 domain type."
)]
UnmappableEncryptedColumn {
table: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,7 @@ impl<'ast> TransformationRule<'ast> for FailOnPlaceholderChange<'ast> {
node_path: &sqltk::NodePath<'ast>,
target_node: &N,
) -> bool {
if self
.check_no_placeholders_have_been_modified(node_path, target_node)
self.check_no_placeholders_have_been_modified(node_path, target_node)
.is_err()
{
return true;
}
false
}
}
1 change: 0 additions & 1 deletion packages/showcase/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ tokio-postgres-rustls = "0.13.0"
rustls = { version = "0.23.20", default-features = false, features = ["std", "aws_lc_rs"] }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
rand = "0.9"
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.99.0"
channel = "1.100.0"
components = ["clippy", "rustfmt"]
profile = "minimal"
Loading