fix type errors

sqlpage · Sep 30, 2023 · 40a06ab · 40a06ab
1 parent ab26b18
commit 40a06ab
Show file tree

Hide file tree

Showing 14 changed files with 179 additions and 159 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ members = [
 
 [package]
 name = "sqlx-oldapi"
-version = "0.6.13"
+version = "0.6.14"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/lovasoa/sqlx"
@@ -125,8 +125,8 @@ bstr = ["sqlx-core/bstr"]
 git2 = ["sqlx-core/git2"]
 
 [dependencies]
-sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.13", path = "sqlx-core", default-features = false }
-sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.13", path = "sqlx-macros", default-features = false, optional = true }
+sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.14", path = "sqlx-core", default-features = false }
+sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.14", path = "sqlx-macros", default-features = false, optional = true }
 
 [dev-dependencies]
 anyhow = "1.0.52"

diff --git a/examples/postgres/axum-social-with-tests/Cargo.toml b/examples/postgres/axum-social-with-tests/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 # Primary crates
 axum = { version = "0.5.13", features = ["macros"] }
-sqlx = { package = "sqlx-oldapi",  version = "0.6.13", path = "../../../", features = ["runtime-tokio-rustls", "postgres", "time", "uuid"] }
+sqlx = { package = "sqlx-oldapi",  version = "0.6.14", path = "../../../", features = ["runtime-tokio-rustls", "postgres", "time", "uuid"] }
 tokio = { version = "1.20.1", features = ["rt-multi-thread", "macros"] }
 
 # Important secondary crates

diff --git a/sqlx-cli/Cargo.toml b/sqlx-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-cli"
-version = "0.6.13"
+version = "0.6.14"
 description = "Command-line utility for SQLx, the Rust SQL toolkit."
 edition = "2021"
 readme = "README.md"

diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-core-oldapi"
-version = "0.6.13"
+version = "0.6.14"
 repository = "https://github.com/lovasoa/sqlx"
 description = "Core of SQLx, the rust SQL toolkit. Not intended to be used directly."
 license = "MIT OR Apache-2.0"
@@ -105,7 +105,7 @@ offline = ["serde", "either/serde"]
 paste = "1.0.6"
 ahash = "0.8.3"
 atoi = "2.0.0"
-sqlx-rt = { path = "../sqlx-rt", version = "0.6.13", package = "sqlx-rt-oldapi" }
+sqlx-rt = { path = "../sqlx-rt", version = "0.6.14", package = "sqlx-rt-oldapi" }
 base64 = { version = "0.21.2", default-features = false, optional = true, features = ["std"] }
 bigdecimal_ = { version = "0.4.1", optional = true, package = "bigdecimal" }
 rust_decimal = { version = "1.19.0", optional = true }

diff --git a/sqlx-core/src/any/migrate.rs b/sqlx-core/src/any/migrate.rs
@@ -1,8 +1,8 @@
 use crate::any::connection::AnyConnectionKind;
 use crate::any::kind::AnyKind;
 use crate::any::{Any, AnyConnection};
-use crate::error::{Error, Result};
-use crate::migrate::{AppliedMigration, Migrate, MigrateDatabase, MigrateError, Migration};
+use crate::error::Result;
+use crate::migrate::{AppliedMigration, Migrate, MigrateDatabase, MigrateResult, Migration};
 use futures_core::future::BoxFuture;
 use std::str::FromStr;
 use std::time::Duration;
@@ -114,7 +114,10 @@ impl Migrate for AnyConnection {
     }
 
     #[allow(deprecated)]
-    fn validate<'e: 'm, 'm>(&'e mut self, migration: &'m Migration) -> BoxFuture<'m, Result<()>> {
+    fn validate<'e: 'm, 'm>(
+        &'e mut self,
+        migration: &'m Migration,
+    ) -> BoxFuture<'m, MigrateResult<()>> {
         match &mut self.0 {
             #[cfg(feature = "postgres")]
             AnyConnectionKind::Postgres(conn) => conn.validate(migration),

diff --git a/sqlx-core/src/migrate/error.rs b/sqlx-core/src/migrate/error.rs
@@ -1,5 +1,4 @@
 use crate::error::{BoxDynError, Error};
-use crate::migrate::Migration;
 
 #[derive(Debug, thiserror::Error)]
 #[non_exhaustive]
@@ -31,3 +30,5 @@ pub enum MigrateError {
     #[error("an operation on the migration metadata table (_sqlx_migrations) failed")]
     AccessMigrationMetadata(#[source] Error),
 }
+
+pub type MigrateResult<T> = std::result::Result<T, MigrateError>;
diff --git a/sqlx-core/src/migrate/migrate.rs b/sqlx-core/src/migrate/migrate.rs
@@ -1,5 +1,5 @@
-use crate::error::{Error, Result};
-use crate::migrate::{AppliedMigration, MigrateError, Migration};
+use crate::error::Result;
+use crate::migrate::{AppliedMigration, MigrateResult, Migration};
 use futures_core::future::BoxFuture;
 use std::time::Duration;
 
@@ -35,7 +35,10 @@ pub trait Migrate {
     // validate the migration
     // checks that it does exist on the database and that the checksum matches
     #[deprecated]
-    fn validate<'e: 'm, 'm>(&'e mut self, migration: &'m Migration) -> BoxFuture<'m, Result<()>>;
+    fn validate<'e: 'm, 'm>(
+        &'e mut self,
+        migration: &'m Migration,
+    ) -> BoxFuture<'m, MigrateResult<()>>;
 
     // Return the ordered list of applied migrations
     fn list_applied_migrations(&mut self) -> BoxFuture<'_, Result<Vec<AppliedMigration>>>;

diff --git a/sqlx-core/src/migrate/mod.rs b/sqlx-core/src/migrate/mod.rs
@@ -6,7 +6,7 @@ mod migration_type;
 mod migrator;
 mod source;
 
-pub use error::MigrateError;
+pub use error::{MigrateError, MigrateResult};
 pub use migrate::{Migrate, MigrateDatabase};
 pub use migration::{AppliedMigration, Migration};
 pub use migration_type::MigrationType;

diff --git a/sqlx-core/src/mysql/migrate.rs b/sqlx-core/src/mysql/migrate.rs
@@ -1,9 +1,9 @@
 use crate::connection::{ConnectOptions, Connection};
 use crate::error::{Error, Result};
 use crate::executor::Executor;
-use crate::migrate::MigrateError;
 use crate::migrate::{AppliedMigration, Migration};
 use crate::migrate::{Migrate, MigrateDatabase};
+use crate::migrate::{MigrateError, MigrateResult};
 use crate::mysql::{MySql, MySqlConnectOptions, MySqlConnection};
 use crate::query::query;
 use crate::query_as::query_as;
@@ -178,14 +178,18 @@ CREATE TABLE IF NOT EXISTS _sqlx_migrations (
         })
     }
 
-    fn validate<'e: 'm, 'm>(&'e mut self, migration: &'m Migration) -> BoxFuture<'m, Result<()>> {
+    fn validate<'e: 'm, 'm>(
+        &'e mut self,
+        migration: &'m Migration,
+    ) -> BoxFuture<'m, MigrateResult<()>> {
         Box::pin(async move {
             // language=SQL
             let checksum: Option<Vec<u8>> =
                 query_scalar("SELECT checksum FROM _sqlx_migrations WHERE version = ?")
                     .bind(migration.version)
                     .fetch_optional(self)
-                    .await?;
+                    .await
+                    .map_err(MigrateError::AccessMigrationMetadata)?;
 
             if let Some(checksum) = checksum {
                 return if checksum == &*migration.checksum {

diff --git a/sqlx-core/src/postgres/migrate.rs b/sqlx-core/src/postgres/migrate.rs
@@ -1,9 +1,9 @@
 use crate::connection::{ConnectOptions, Connection};
-use crate::error::{Error, Result};
+use crate::error::Result;
 use crate::executor::Executor;
-use crate::migrate::MigrateError;
 use crate::migrate::{AppliedMigration, Migration};
 use crate::migrate::{Migrate, MigrateDatabase};
+use crate::migrate::{MigrateError, MigrateResult};
 use crate::postgres::{PgConnectOptions, PgConnection, Postgres};
 use crate::query::query;
 use crate::query_as::query_as;
@@ -188,14 +188,18 @@ CREATE TABLE IF NOT EXISTS _sqlx_migrations (
         })
     }
 
-    fn validate<'e: 'm, 'm>(&'e mut self, migration: &'m Migration) -> BoxFuture<'m, Result<()>> {
+    fn validate<'e: 'm, 'm>(
+        &'e mut self,
+        migration: &'m Migration,
+    ) -> BoxFuture<'m, MigrateResult<()>> {
         Box::pin(async move {
             // language=SQL
             let checksum: Option<Vec<u8>> =
                 query_scalar("SELECT checksum FROM _sqlx_migrations WHERE version = $1")
                     .bind(migration.version)
                     .fetch_optional(self)
-                    .await?;
+                    .await
+                    .map_err(MigrateError::AccessMigrationMetadata)?;
 
             if let Some(checksum) = checksum {
                 return if checksum == &*migration.checksum {

diff --git a/sqlx-core/src/sqlite/migrate.rs b/sqlx-core/src/sqlite/migrate.rs
@@ -1,9 +1,9 @@
 use crate::connection::{ConnectOptions, Connection};
-use crate::error::{Error, Result};
+use crate::error::Result;
 use crate::executor::Executor;
-use crate::migrate::MigrateError;
 use crate::migrate::{AppliedMigration, Migration};
 use crate::migrate::{Migrate, MigrateDatabase};
+use crate::migrate::{MigrateError, MigrateResult};
 use crate::query::query;
 use crate::query_as::query_as;
 use crate::query_scalar::query_scalar;
@@ -139,14 +139,18 @@ CREATE TABLE IF NOT EXISTS _sqlx_migrations (
         Box::pin(async move { Ok(()) })
     }
 
-    fn validate<'e: 'm, 'm>(&'e mut self, migration: &'m Migration) -> BoxFuture<'m, Result<()>> {
+    fn validate<'e: 'm, 'm>(
+        &'e mut self,
+        migration: &'m Migration,
+    ) -> BoxFuture<'m, MigrateResult<()>> {
         Box::pin(async move {
             // language=SQL
             let checksum: Option<Vec<u8>> =
                 query_scalar("SELECT checksum FROM _sqlx_migrations WHERE version = ?1")
                     .bind(migration.version)
                     .fetch_optional(self)
-                    .await?;
+                    .await
+                    .map_err(MigrateError::AccessMigrationMetadata)?;
 
             if let Some(checksum) = checksum {
                 if checksum == &*migration.checksum {

diff --git a/sqlx-macros/Cargo.toml b/sqlx-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-macros-oldapi"
-version = "0.6.13"
+version = "0.6.14"
 repository = "https://github.com/lovasoa/sqlx"
 description = "Macros for SQLx, the rust SQL toolkit. Not intended to be used directly."
 license = "MIT OR Apache-2.0"
@@ -75,8 +75,8 @@ heck = { version = "0.4", features = ["unicode"] }
 either = "1.6.1"
 once_cell = "1.9.0"
 proc-macro2 = { version = "1.0.36", default-features = false }
-sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.13", default-features = false, features = ["any"], path = "../sqlx-core" }
-sqlx-rt = { version = "0.6.13", default-features = false, path = "../sqlx-rt", package = "sqlx-rt-oldapi" }
+sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.14", default-features = false, features = ["any"], path = "../sqlx-core" }
+sqlx-rt = { version = "0.6.14", default-features = false, path = "../sqlx-rt", package = "sqlx-rt-oldapi" }
 serde = { version = "1.0.132", features = ["derive"], optional = true }
 serde_json = { version = "1.0.73", optional = true }
 sha2 = { version = "0.10.0", optional = true }

diff --git a/sqlx-rt/Cargo.toml b/sqlx-rt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-rt-oldapi"
-version = "0.6.13"
+version = "0.6.14"
 repository = "https://github.com/launchbadge/sqlx"
 license = "MIT OR Apache-2.0"
 description = "Runtime abstraction used by SQLx, the Rust SQL toolkit. Not intended to be used directly."