diff --git a/crates/cdk-sql-common/src/common.rs b/crates/cdk-sql-common/src/common.rs index 325b8443..ccdd4cad 100644 --- a/crates/cdk-sql-common/src/common.rs +++ b/crates/cdk-sql-common/src/common.rs @@ -21,13 +21,14 @@ pub async fn migrate( // Apply each migration if it hasn’t been applied yet for (name, sql) in migrations { - let basename = if let Some((prefix, basename)) = name.split_once(['/', '\\']) { - if prefix != db_prefix { - continue; + let basename = match name.split_once(['/', '\\']) { + Some((prefix, basename)) => { + if prefix != db_prefix { + continue; + } + basename } - basename - } else { - name + None => name, }; let is_missing = query("SELECT name FROM migrations WHERE name = :name")? diff --git a/crates/cdk-sql-common/src/pool.rs b/crates/cdk-sql-common/src/pool.rs index 6f8561e6..3085a0ee 100644 --- a/crates/cdk-sql-common/src/pool.rs +++ b/crates/cdk-sql-common/src/pool.rs @@ -37,7 +37,7 @@ pub trait ResourceManager: Debug { /// Creates a new resource with a given config. /// - /// If `stale` is every set to TRUE it is assumed the resource is no longer valid and it will be + /// If `stale` is ever set to TRUE it is assumed the resource is no longer valid and it will be /// dropped. fn new_resource( config: &Self::Config, diff --git a/crates/cdk-sql-common/src/stmt.rs b/crates/cdk-sql-common/src/stmt.rs index f66767ba..9f686e54 100644 --- a/crates/cdk-sql-common/src/stmt.rs +++ b/crates/cdk-sql-common/src/stmt.rs @@ -176,9 +176,11 @@ impl Statement { } else { let parts = split_sql_parts(sql)?; - let _ = cache.write().map(|mut cache| { + if let Ok(mut cache) = cache.write() { cache.insert(sql.to_owned(), (parts.clone(), None)); - }); + } else { + tracing::warn!("Failed to acquire write lock for SQL statement cache"); + } Ok(Self { parts, diff --git a/crates/cdk-sqlite/tests/legacy-sqlx.sql b/crates/cdk-sqlite/tests/legacy-sqlx.sql index dfe4d79d..f28c566f 100644 --- a/crates/cdk-sqlite/tests/legacy-sqlx.sql +++ b/crates/cdk-sqlite/tests/legacy-sqlx.sql @@ -70,7 +70,7 @@ CREATE TABLE IF NOT EXISTS "proof" ( amount INTEGER NOT NULL, keyset_id TEXT NOT NULL, -- no FK constraint here secret TEXT NOT NULL, - c BLOBNOT NULL, + c BLOB NOT NULL, witness TEXT, state TEXT CHECK (state IN ('SPENT', 'PENDING', 'UNSPENT', 'RESERVED', 'UNKNOWN')) NOT NULL, quote_id TEXT,