From 136bb474ca6bdb3eb53c0a71a8d227851c6321fd Mon Sep 17 00:00:00 2001 From: Austin Bonander Date: Mon, 4 Mar 2024 17:09:43 -0800 Subject: [PATCH 1/2] fix(migrate): improve error message when parsing version from filename supercedes #2906 --- sqlx-core/src/migrate/source.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sqlx-core/src/migrate/source.rs b/sqlx-core/src/migrate/source.rs index dd6d36afcc..7966dd1273 100644 --- a/sqlx-core/src/migrate/source.rs +++ b/sqlx-core/src/migrate/source.rs @@ -47,7 +47,10 @@ impl<'s> MigrationSource<'s> for &'s Path { continue; } - let version: i64 = parts[0].parse()?; + let version: i64 = parts[0].parse() + .map_err(|_e| { + format!("error parsing migration filename {file_name:?}; expected integer version prefix (e.g. `01_foo.sql`)") + })?; let migration_type = MigrationType::from_filename(parts[1]); // remove the `.sql` and replace `_` with ` ` From 7cced0ff0659119c975cd669c72e997b50820a0c Mon Sep 17 00:00:00 2001 From: Austin Bonander Date: Mon, 4 Mar 2024 19:30:45 -0800 Subject: [PATCH 2/2] fix(ci): disable `mariadb_verylatest` pass for RusTLS see: #3091 --- .github/workflows/sqlx.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/sqlx.yml b/.github/workflows/sqlx.yml index 153ea24479..a7cf763cbe 100644 --- a/.github/workflows/sqlx.yml +++ b/.github/workflows/sqlx.yml @@ -470,6 +470,10 @@ jobs: mariadb: [verylatest, 10_11, 10_4] runtime: [async-std, tokio] tls: [native-tls, rustls, none] + exclude: + # FIXME: `rustls` cannot accept MariaDB's new self-signed certificates: https://github.com/launchbadge/sqlx/issues/3091 + - mariadb: verylatest + tls: rustls needs: check steps: - uses: actions/checkout@v2