v0.6.20

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.6.20
+
+ - Migrate to rustls 0.22
+
 ## 0.6.19
 
  - Added support for user-defined sqlite functions

Cargo.toml

@@ -20,7 +20,7 @@ members = [
 
 [package]
 name = "sqlx-oldapi"
-version = "0.6.19"
+version = "0.6.20"
 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.19", path = "sqlx-core", default-features = false }
-sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.19", path = "sqlx-macros", default-features = false, optional = true }
+sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.20", path = "sqlx-core", default-features = false }
+sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.20", path = "sqlx-macros", default-features = false, optional = true }
 
 [dev-dependencies]
 anyhow = "1.0.52"

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.19", path = "../../../", features = ["runtime-tokio-rustls", "postgres", "time", "uuid"] }
+sqlx = { package = "sqlx-oldapi",  version = "0.6.20", path = "../../../", features = ["runtime-tokio-rustls", "postgres", "time", "uuid"] }
 tokio = { version = "1.20.1", features = ["rt-multi-thread", "macros"] }
 
 # Important secondary crates

sqlx-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-cli"
-version = "0.6.19"
+version = "0.6.20"
 description = "Command-line utility for SQLx, the Rust SQL toolkit."
 edition = "2021"
 readme = "README.md"

sqlx-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-core-oldapi"
-version = "0.6.19"
+version = "0.6.20"
 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"
@@ -101,7 +101,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.19", package = "sqlx-rt-oldapi" }
+sqlx-rt = { path = "../sqlx-rt", version = "0.6.20", 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 }

sqlx-core/src/io/mod.rs

@@ -1,3 +1,4 @@
+#![allow(unused_imports)]
 mod buf;
 mod buf_mut;
 mod buf_stream;

sqlx-core/src/mssql/types/chrono.rs

@@ -182,7 +182,7 @@ fn decode_time(scale: u8, data: &[u8]) -> error::Result<NaiveTime> {
 }
 
 fn decode_date(bytes: &[u8]) -> error::Result<NaiveDate> {
-    let days_from_ce = LittleEndian::read_i24(&bytes);
+    let days_from_ce = LittleEndian::read_i24(bytes);
     chrono::NaiveDate::from_num_days_from_ce_opt(days_from_ce + 1)
         .ok_or_else(|| err_protocol!("invalid days offset in date: {}", days_from_ce))
 }

sqlx-core/src/mssql/types/json.rs

@@ -33,7 +33,7 @@ where
 {
     fn produces(&self) -> Option<MssqlTypeInfo> {
         let size = 0xFF_FF;
-        return Some(MssqlTypeInfo(TypeInfo::new(DataType::BigVarBinary, size)));
+        Some(MssqlTypeInfo(TypeInfo::new(DataType::BigVarBinary, size)))
     }
 
     fn encode_by_ref(&self, buf: &mut Vec<u8>) -> IsNull {

sqlx-core/src/mssql/types/uint.rs

@@ -25,6 +25,6 @@ impl Encode<'_, Mssql> for u8 {
 
 impl Decode<'_, Mssql> for u8 {
     fn decode(value: MssqlValueRef<'_>) -> Result<Self, BoxDynError> {
-        Ok(value.as_bytes()?[0] as u8)
+        Ok(value.as_bytes()?[0])
     }
 }

sqlx-core/src/net/mod.rs

@@ -1,8 +1,11 @@
 mod socket;
 mod tls;
 
+#[allow(unused_imports)]
 pub use socket::Socket;
-pub use tls::{CertificateInput, MaybeTlsStream};
+pub use tls::CertificateInput;
+#[allow(unused_imports)]
+pub use tls::MaybeTlsStream;
 
 #[cfg(feature = "_rt-async-std")]
 type PollReadBuf<'a> = [u8];

sqlx-core/src/net/tls/rustls.rs

@@ -24,7 +24,7 @@ pub async fn configure_tls_connector(
             .with_custom_certificate_verifier(Arc::new(DummyTlsVerifier))
             .with_no_client_auth()
     } else {
-        let mut cert_store = rustls::RootCertStore {
+        let mut cert_store = RootCertStore {
             roots: webpki_roots::TLS_SERVER_ROOTS.iter().cloned().collect(),
         };
 

sqlx-core/src/postgres/message/mod.rs

@@ -37,6 +37,7 @@ pub use copy::{CopyData, CopyDone, CopyFail, CopyResponse};
 pub use data_row::DataRow;
 pub use describe::Describe;
 pub use execute::Execute;
+#[allow(unused_imports)]
 pub use flush::Flush;
 pub use notification::Notification;
 pub use parameter_description::ParameterDescription;

sqlx-core/src/postgres/types/interval.rs

@@ -171,7 +171,7 @@ impl TryFrom<chrono::Duration> for PgInterval {
                 Ok(Self {
                     months: 0,
                     days: 0,
-                    microseconds: microseconds,
+                    microseconds,
                 })
             },
         )

sqlx-core/src/sqlite/migrate.rs

@@ -27,8 +27,7 @@ impl MigrateDatabase for Sqlite {
             }
 
             // Opening a connection to sqlite creates the database
-            let _ = opts
-                .connect()
+            opts.connect()
                 .await?
                 // Ensure WAL mode tempfiles are cleaned up
                 .close()
@@ -153,7 +152,7 @@ CREATE TABLE IF NOT EXISTS _sqlx_migrations (
                     .map_err(MigrateError::AccessMigrationMetadata)?;
 
             if let Some(checksum) = checksum {
-                if checksum == &*migration.checksum {
+                if checksum == *migration.checksum {
                     Ok(())
                 } else {
                     Err(MigrateError::VersionMismatch(migration.version))

sqlx-core/src/sqlite/statement/mod.rs

@@ -57,7 +57,7 @@ impl ColumnIndex<SqliteStatement<'_>> for &'_ str {
             .column_names
             .get(*self)
             .ok_or_else(|| Error::ColumnNotFound((*self).into()))
-            .map(|v| *v)
+            .copied()
     }
 }
 

sqlx-core/src/sqlite/types/chrono.rs

@@ -156,7 +156,7 @@ fn decode_datetime_from_text(value: &str) -> Option<DateTime<FixedOffset>> {
 }
 
 fn decode_datetime_from_int(value: i64) -> Option<DateTime<FixedOffset>> {
-    NaiveDateTime::from_timestamp_opt(value, 0).map(|dt| Utc.fix().from_utc_datetime(&dt))
+    DateTime::from_timestamp(value, 0).map(|dt| dt.fixed_offset())
 }
 
 fn decode_datetime_from_float(value: f64) -> Option<DateTime<FixedOffset>> {
@@ -166,7 +166,7 @@ fn decode_datetime_from_float(value: f64) -> Option<DateTime<FixedOffset>> {
     let seconds = timestamp as i64;
     let nanos = (timestamp.fract() * 1E9) as u32;
 
-    NaiveDateTime::from_timestamp_opt(seconds, nanos).map(|dt| Utc.fix().from_utc_datetime(&dt))
+    DateTime::from_timestamp(seconds, nanos).map(|dt| dt.fixed_offset())
 }
 
 impl<'r> Decode<'r, Sqlite> for NaiveDateTime {

sqlx-core/src/sqlite/types/json.rs

@@ -37,7 +37,7 @@ where
     fn decode(value: SqliteValueRef<'r>) -> Result<Self, BoxDynError> {
         let string_value = <&str as Decode<Sqlite>>::decode(value)?;
 
-        serde_json::from_str(&string_value)
+        serde_json::from_str(string_value)
             .map(Json)
             .map_err(Into::into)
     }

sqlx-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-macros-oldapi"
-version = "0.6.19"
+version = "0.6.20"
 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.19", default-features = false, features = ["any"], path = "../sqlx-core" }
-sqlx-rt = { version = "0.6.19", default-features = false, path = "../sqlx-rt", package = "sqlx-rt-oldapi" }
+sqlx-core = { package = "sqlx-core-oldapi",  version = "0.6.20", default-features = false, features = ["any"], path = "../sqlx-core" }
+sqlx-rt = { version = "0.6.20", 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 }

sqlx-rt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sqlx-rt-oldapi"
-version = "0.6.19"
+version = "0.6.20"
 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."

tests/mssql/types.rs

@@ -55,9 +55,9 @@ test_type!(numeric<f64>(Mssql,
     "CAST(12 AS NUMERIC)" == 12_f64,
     "CAST(939399419.1225182 AS NUMERIC(15,2))" == 939399419.12_f64,
     "CAST(939399419.1225182 AS DECIMAL(15,2))" == 939399419.12_f64,
-    "CAST(123456789.0123456789 AS NUMERIC(38,10))" == 123456789.0123456789_f64,
-    "CAST(123456789.0123456789012 AS NUMERIC(38,13))" == 123456789.0123456789012_f64,
-    "CAST(123456789.012345678901234 AS NUMERIC(38,15))" == 123456789.012345678901234_f64,
+    "CAST(123456789.0123456789 AS NUMERIC(38,10))" == 123_456_789.012_345_67_f64,
+    "CAST(123456789.0123456789012 AS NUMERIC(38,13))" == 123_456_789.012_345_67_f64,
+    "CAST(123456789.012345678901234 AS NUMERIC(38,15))" == 123_456_789.012_345_67_f64,
 ));
 
 test_type!(str_nvarchar<String>(Mssql,

tests/mysql/describe.rs

@@ -51,8 +51,8 @@ CREATE TEMPORARY TABLE with_bit_and_tinyint (
     assert_eq!(d.column(1).name(), "value_bit_1");
     assert_eq!(d.column(1).type_info().name(), "BIT");
 
-    assert!(<bool as Type<MySql>>::compatible(&d.column(1).type_info()));
-    assert!(<bool as Type<MySql>>::compatible(&d.column(2).type_info()));
+    assert!(<bool as Type<MySql>>::compatible(d.column(1).type_info()));
+    assert!(<bool as Type<MySql>>::compatible(d.column(2).type_info()));
 
     Ok(())
 }

tests/mysql/test-attr.rs

@@ -76,7 +76,7 @@ async fn it_gets_comments(pool: MySqlPool) -> sqlx_oldapi::Result<()> {
     let post_1_comments: Vec<String> = sqlx_oldapi::query_scalar(
         "SELECT content FROM comment WHERE post_id = ? ORDER BY created_at",
     )
-    .bind(&1)
+    .bind(1)
     .fetch_all(&pool)
     .await?;
 
@@ -88,7 +88,7 @@ async fn it_gets_comments(pool: MySqlPool) -> sqlx_oldapi::Result<()> {
     let post_2_comments: Vec<String> = sqlx_oldapi::query_scalar(
         "SELECT content FROM comment WHERE post_id = ? ORDER BY created_at",
     )
-    .bind(&2)
+    .bind(2)
     .fetch_all(&pool)
     .await?;
 

tests/mysql/types.rs

@@ -88,7 +88,7 @@
 
     test_type!(chrono_timestamp<DateTime::<Utc>>(MySql,
         "TIMESTAMP '2019-01-02 05:10:20.115100'"
             == DateTime::<Utc>::from_utc(
                 NaiveDateTime::parse_from_str("2019-01-02 05:10:20.115100", "%Y-%m-%d %H:%M:%S%.f").unwrap(),
                 Utc,
             )
@@ -96,7 +96,7 @@
 
     test_type!(chrono_fixed_offset<DateTime::<FixedOffset>>(MySql,
         "TIMESTAMP '2019-01-02 05:10:20.115100'"
             == DateTime::<Utc>::from_utc(
                 NaiveDateTime::parse_from_str("2019-01-02 05:10:20.115100", "%Y-%m-%d %H:%M:%S%.f").unwrap(),
                 Utc,
             )
@@ -305,8 +305,8 @@
     .await?;
 
     sqlx_oldapi::query("INSERT INTO with_bits (value_1, value_n) VALUES (?, ?)")
-        .bind(&1_u8)
-        .bind(&510202_u32)
+        .bind(1_u8)
+        .bind(510202_u32)
         .execute(&mut conn)
         .await?;