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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.13.1
24.19.0
15 changes: 9 additions & 6 deletions crates/sqlx-sqlite-conn-mgr/src/attached.rs
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,10 @@ mod tests {
.fetch_all(&mut *conn)
.await
.unwrap();
let names: Vec<String> = rows.iter().map(|row| row.get::<String, _>("name")).collect();
let names: Vec<String> = rows
.iter()
.map(|row| row.get::<String, _>("name"))
.collect();
assert_eq!(
names,
vec!["main".to_string()],
Expand Down Expand Up @@ -1061,7 +1064,10 @@ mod tests {
.fetch_all(&mut *writer)
.await
.unwrap();
let names: Vec<String> = rows.iter().map(|row| row.get::<String, _>("name")).collect();
let names: Vec<String> = rows
.iter()
.map(|row| row.get::<String, _>("name"))
.collect();
assert_eq!(
names,
vec!["main".to_string()],
Expand Down Expand Up @@ -1204,10 +1210,7 @@ mod tests {

/// Builds `count` distinct single-table databases with distinct schema aliases,
/// suitable for pushing past SQLite's default `SQLITE_LIMIT_ATTACHED` (10).
async fn build_many_attach_specs(
count: usize,
temp_dir: &TempDir,
) -> Vec<AttachedSpec> {
async fn build_many_attach_specs(count: usize, temp_dir: &TempDir) -> Vec<AttachedSpec> {
let mut specs = Vec::with_capacity(count);
for i in 0..count {
let db = create_test_db(&format!("many{i}.db"), temp_dir).await;
Expand Down
3 changes: 1 addition & 2 deletions crates/sqlx-sqlite-observer/src/conn_mgr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,7 @@ pub async fn acquire_writer_with_attached_brokers(
// and something to call `ensure_table_info()` on, which reads the
// attached database's own read pool - so it's rebuilt from the
// broker rather than read out whole. See `from_broker`'s doc.
let observable =
ObservableSqliteDatabase::from_broker(Arc::clone(&spec.database), broker);
let observable = ObservableSqliteDatabase::from_broker(Arc::clone(&spec.database), broker);

// Fail loud rather than let `insert` silently overwrite. The
// validation above already rules this out, so it should never fire;
Expand Down
6 changes: 5 additions & 1 deletion crates/sqlx-sqlite-toolkit/tests/attached_detach_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,11 @@ async fn failed_attached_transaction_statement_still_releases_the_alias() {
.fetch_all("SELECT msg FROM logs".into(), vec![])
.await
.expect("logs should be readable");
assert_eq!(rows.len(), 1, "the rolled-back 'ok' row must not be present");
assert_eq!(
rows.len(),
1,
"the rolled-back 'ok' row must not be present"
);
assert_eq!(
rows[0]["msg"].as_str(),
Some("after failure"),
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"scripts": {
"build": "rollup -c",
"check:iife": "rollup -c && git diff --exit-code api-iife.js",
"check-node-version": "check-node-version --npm 10.5.0",
"check-node-version": "check-node-version --npm 11.17.0",
"commitlint": "commitlint --from ${COMMITLINT_FROM:-002bcc8} --to ${COMMITLINT_TO:-HEAD}",
"eslint": "eslint .",
"eslint:fix": "eslint . --fix",
"type-check:ts": "tsc -b --pretty",
"type-check": "run-p type-check:ts",
"markdownlint": "markdownlint-cli2",
"prepare": "rollup -c",
"standards": "npm run eslint && npm run type-check && npm run markdownlint && npm run check:iife && npm run rust:lint && npm run commitlint",
"standards": "npm run eslint && npm run type-check && npm run markdownlint && npm run check:iife && npm run rust:lint && npm run commitlint && npm run check-node-version",
"rust:lint": "cargo lint-clippy && cargo lint-fmt",
"rust:lint:fix": "cargo fix-clippy && cargo fix-fmt",
"test": "vitest run && cargo test --workspace --lib --test '*'",
Expand Down
Loading