From 4748f6c545e5696211fbea9cebe716bf83486959 Mon Sep 17 00:00:00 2001
From: Bogdan Mircea <mirceapetrebogdan@gmail.com>
Date: Fri, 6 Jun 2025 10:20:59 +0300
Subject: [PATCH 1/3] Make sqlx-macros-core::database public

---
 sqlx-macros-core/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sqlx-macros-core/src/lib.rs b/sqlx-macros-core/src/lib.rs
index 0bd8f38bb7..1f790b5821 100644
--- a/sqlx-macros-core/src/lib.rs
+++ b/sqlx-macros-core/src/lib.rs
@@ -27,7 +27,7 @@ pub type Error = Box<dyn std::error::Error>;
 pub type Result<T> = std::result::Result<T, Error>;
 
 mod common;
-mod database;
+pub mod database;
 
 #[cfg(feature = "derive")]
 pub mod derives;

From 9ec4682c9e1c55d38b3c505ca8e1204e0546f69c Mon Sep 17 00:00:00 2001
From: Bogdan Mircea <mirceapetrebogdan@gmail.com>
Date: Fri, 6 Jun 2025 17:42:29 +0300
Subject: [PATCH 2/3] Move driver installation to bins

---
 sqlx-cli/src/bin/cargo-sqlx.rs | 2 ++
 sqlx-cli/src/bin/sqlx.rs       | 2 ++
 sqlx-cli/src/lib.rs            | 2 --
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sqlx-cli/src/bin/cargo-sqlx.rs b/sqlx-cli/src/bin/cargo-sqlx.rs
index a5b5db8ea9..e7ebcc92eb 100644
--- a/sqlx-cli/src/bin/cargo-sqlx.rs
+++ b/sqlx-cli/src/bin/cargo-sqlx.rs
@@ -15,6 +15,8 @@ enum Cli {
 async fn main() {
     sqlx_cli::maybe_apply_dotenv();
 
+    sqlx::any::install_default_drivers();
+
     let Cli::Sqlx(opt) = Cli::parse();
 
     if let Err(error) = sqlx_cli::run(opt).await {
diff --git a/sqlx-cli/src/bin/sqlx.rs b/sqlx-cli/src/bin/sqlx.rs
index c015907990..23f9ac5607 100644
--- a/sqlx-cli/src/bin/sqlx.rs
+++ b/sqlx-cli/src/bin/sqlx.rs
@@ -7,6 +7,8 @@ async fn main() {
     // Checks for `--no-dotenv` before parsing.
     sqlx_cli::maybe_apply_dotenv();
 
+    sqlx::any::install_default_drivers();
+
     let opt = Opt::parse();
 
     // no special handling here
diff --git a/sqlx-cli/src/lib.rs b/sqlx-cli/src/lib.rs
index adcc6a1306..43096c4058 100644
--- a/sqlx-cli/src/lib.rs
+++ b/sqlx-cli/src/lib.rs
@@ -204,8 +204,6 @@ where
     F: FnMut(&'a str) -> Fut,
     Fut: Future<Output = sqlx::Result<T>> + 'a,
 {
-    sqlx::any::install_default_drivers();
-
     let db_url = opts.expect_db_url()?;
 
     backoff::future::retry(

From bc1c7e20037e6634362ddc1d8e281e97fb965844 Mon Sep 17 00:00:00 2001
From: Bogdan Mircea <mirceapetrebogdan@gmail.com>
Date: Fri, 6 Jun 2025 21:42:17 +0300
Subject: [PATCH 3/3] Fix lint

---
 sqlx-macros-core/src/database/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sqlx-macros-core/src/database/mod.rs b/sqlx-macros-core/src/database/mod.rs
index f74a58b699..50cd516c22 100644
--- a/sqlx-macros-core/src/database/mod.rs
+++ b/sqlx-macros-core/src/database/mod.rs
@@ -33,6 +33,7 @@ pub struct CachingDescribeBlocking<DB: DatabaseExt> {
 
 #[allow(dead_code)]
 impl<DB: DatabaseExt> CachingDescribeBlocking<DB> {
+    #[allow(clippy::new_without_default, reason = "internal API")]
     pub const fn new() -> Self {
         CachingDescribeBlocking {
             connections: LazyLock::new(|| Mutex::new(HashMap::new())),