From 418d36c959c0acbfe970aee54e31ddd5e6fd71a7 Mon Sep 17 00:00:00 2001 From: lovasoa Date: Tue, 17 Oct 2023 00:13:46 +0200 Subject: [PATCH] update event-listener to v3.0.0 --- CHANGELOG.md | 5 +++++ Cargo.lock | 12 ++++++------ Cargo.toml | 6 +++--- examples/postgres/axum-social-with-tests/Cargo.toml | 2 +- sqlx-cli/Cargo.toml | 2 +- sqlx-core/Cargo.toml | 6 +++--- sqlx-core/src/pool/mod.rs | 2 +- sqlx-macros/Cargo.toml | 6 +++--- sqlx-rt/Cargo.toml | 2 +- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a12da692a4..2758b0013a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ 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.16 + + - Report line numbers in mssql errors + - update dependencies + ## 0.6.15 - Handle precise syntax error position reporting in sqlite even when executing multiple statements from a single sql string diff --git a/Cargo.lock b/Cargo.lock index a574b32beb..3f68620af9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3143,7 +3143,7 @@ dependencies = [ [[package]] name = "sqlx-cli" -version = "0.6.15" +version = "0.6.16" dependencies = [ "anyhow", "async-trait", @@ -3168,7 +3168,7 @@ dependencies = [ [[package]] name = "sqlx-core-oldapi" -version = "0.6.15" +version = "0.6.16" dependencies = [ "ahash 0.8.3", "atoi", @@ -3187,7 +3187,7 @@ dependencies = [ "dotenvy", "either", "encoding_rs", - "event-listener 2.5.3", + "event-listener 3.0.0", "flume", "futures-channel", "futures-core", @@ -3329,7 +3329,7 @@ dependencies = [ [[package]] name = "sqlx-macros-oldapi" -version = "0.6.15" +version = "0.6.16" dependencies = [ "dotenvy", "either", @@ -3349,7 +3349,7 @@ dependencies = [ [[package]] name = "sqlx-oldapi" -version = "0.6.15" +version = "0.6.16" dependencies = [ "anyhow", "async-std", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "sqlx-rt-oldapi" -version = "0.6.15" +version = "0.6.16" dependencies = [ "async-native-tls", "async-std", diff --git a/Cargo.toml b/Cargo.toml index 4c2cf970df..b6e7dfa769 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ members = [ [package] name = "sqlx-oldapi" -version = "0.6.15" +version = "0.6.16" 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.15", path = "sqlx-core", default-features = false } -sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.15", path = "sqlx-macros", default-features = false, optional = true } +sqlx-core = { package = "sqlx-core-oldapi", version = "0.6.16", path = "sqlx-core", default-features = false } +sqlx-macros = { package = "sqlx-macros-oldapi", version = "0.6.16", 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 index 026caf6cc6..996ed9b82f 100644 --- 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.15", path = "../../../", features = ["runtime-tokio-rustls", "postgres", "time", "uuid"] } +sqlx = { package = "sqlx-oldapi", version = "0.6.16", 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 index 971e591f85..cd054a6007 100644 --- a/sqlx-cli/Cargo.toml +++ b/sqlx-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sqlx-cli" -version = "0.6.15" +version = "0.6.16" 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 index d0e6bfe082..47c5d52506 100644 --- a/sqlx-core/Cargo.toml +++ b/sqlx-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sqlx-core-oldapi" -version = "0.6.15" +version = "0.6.16" 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.15", package = "sqlx-rt-oldapi" } +sqlx-rt = { path = "../sqlx-rt", version = "0.6.16", 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 } @@ -171,7 +171,7 @@ hashlink = "0.8.0" # https://github.com/tkaitchuck/aHash/issues/95#issuecomment-874150078 indexmap = "2.0.0" hkdf = { version = "0.12.0", optional = true } -event-listener = "2.5.2" +event-listener = "3.0.0" dotenvy = "0.15" diff --git a/sqlx-core/src/pool/mod.rs b/sqlx-core/src/pool/mod.rs index 342ef3ba1d..576f2ea3b5 100644 --- a/sqlx-core/src/pool/mod.rs +++ b/sqlx-core/src/pool/mod.rs @@ -247,7 +247,7 @@ pub struct Pool(pub(crate) Arc>); /// /// See [`Pool::close_event()`] for details. pub struct CloseEvent { - listener: Option, + listener: Option>>, } impl Pool { diff --git a/sqlx-macros/Cargo.toml b/sqlx-macros/Cargo.toml index da6882513a..7cc9c247d7 100644 --- a/sqlx-macros/Cargo.toml +++ b/sqlx-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sqlx-macros-oldapi" -version = "0.6.15" +version = "0.6.16" 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.15", default-features = false, features = ["any"], path = "../sqlx-core" } -sqlx-rt = { version = "0.6.15", default-features = false, path = "../sqlx-rt", package = "sqlx-rt-oldapi" } +sqlx-core = { package = "sqlx-core-oldapi", version = "0.6.16", default-features = false, features = ["any"], path = "../sqlx-core" } +sqlx-rt = { version = "0.6.16", 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 index dd8a35d499..febd368c9c 100644 --- a/sqlx-rt/Cargo.toml +++ b/sqlx-rt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sqlx-rt-oldapi" -version = "0.6.15" +version = "0.6.16" 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."