refactor(db): 从 URL scheme 自动推断驱动类型，重命名数据库用户名配置为user，修复 PostgreSQL 查询逻辑

Author: xgpxg

crates/webr-db/src/config.rs

@@ -3,12 +3,10 @@ use serde::Deserialize;
 /// Database connection pool configuration.
 #[derive(Debug, Clone, Deserialize)]
 pub struct DatasourceConfig {
-    /// Driver: "mysql", "postgres", or "sqlite"
-    pub driver: String,
-    /// Full connection URL, e.g. "postgres://host:5432/mydb"
+    /// Full connection URL, e.g. "postgres://host:5432/db"
     pub url: String,
-    /// Optional username injected into the URL (replaces any embedded credentials)
-    pub username: Option<String>,
+    /// Optional user injected into the URL (replaces any embedded credentials)
+    pub user: Option<String>,
     /// Optional password injected into the URL
     pub password: Option<String>,
     /// Pool tuning parameters
@@ -51,17 +49,35 @@ fn default_idle_timeout() -> u64 {
 }
 
 impl DatasourceConfig {
+    /// Infer the driver from the URL scheme.
+    ///
+    /// Supported schemes: `postgres`, `mysql`, `sqlite`.
+    pub fn resolve_driver(&self) -> Result<&str, crate::DbError> {
+        let scheme = self.url.split_once(':').map(|(s, _)| s).ok_or_else(|| {
+            crate::DbError::Config(format!(
+                "cannot infer driver: url has no scheme: '{}'",
+                self.url
+            ))
+        })?;
+        match scheme {
+            "postgres" | "mysql" | "sqlite" => Ok(scheme),
+            other => Err(crate::DbError::Config(format!(
+                "unsupported driver '{other}' in url scheme"
+            ))),
+        }
+    }
+
     /// Resolve the final connection URL.
     ///
-    /// Merges `username`/`password` into the URL's authority section when configured.
+    /// Merges `user`/`password` into the URL's authority section when configured.
     pub fn resolve_url(&self) -> Result<String, crate::DbError> {
         Ok(self.merge_credentials(&self.url))
     }
 
-    /// Inject `username`/`password` into an existing URL, replacing any embedded credentials.
+    /// Inject `user`/`password` into an existing URL, replacing any embedded credentials.
     /// Returns the URL unchanged if neither field is configured.
     fn merge_credentials(&self, url: &str) -> String {
-        let user = self.username.as_deref();
+        let user = self.user.as_deref();
         let pass = self.password.as_deref();
         if user.is_none() && pass.is_none() {
             return url.to_string();

crates/webr-db/src/executor.rs

@@ -365,7 +365,15 @@ impl DbPool {
             match ins {
                 #[cfg(feature = "postgres")]
                 ExecutionBinder::Postgres(q) => {
-                    q.fetch_one(self.as_pg()).await.map_err(DbError::Sqlx)
+                    q.execute(self.as_pg()).await.map_err(DbError::Sqlx)?;
+                    let fq = self.query_as::<R>(fetch_sql);
+                    match fq {
+                        QueryBinder::Postgres(q) => {
+                            q.fetch_one(self.as_pg()).await.map_err(DbError::Sqlx)
+                        }
+                        #[allow(unreachable_patterns)]
+                        _ => unreachable!(),
+                    }
                 }
                 #[cfg(feature = "mysql")]
                 ExecutionBinder::MySql(q) => {
@@ -599,10 +607,18 @@ impl DbTransaction {
             let mut __g = self.lock().await;
             match ins {
                 #[cfg(feature = "postgres")]
-                ExecutionBinder::Postgres(q) => q
-                    .fetch_one(Self::as_pg(&mut __g))
-                    .await
-                    .map_err(DbError::Sqlx),
+                ExecutionBinder::Postgres(q) => {
+                    q.execute(Self::as_pg(&mut __g)).await.map_err(DbError::Sqlx)?;
+                    let fq = self.query_as::<R>(fetch_sql);
+                    match fq {
+                        QueryBinder::Postgres(q) => q
+                            .fetch_one(Self::as_pg(&mut __g))
+                            .await
+                            .map_err(DbError::Sqlx),
+                        #[allow(unreachable_patterns)]
+                        _ => unreachable!(),
+                    }
+                }
                 #[cfg(feature = "mysql")]
                 ExecutionBinder::MySql(q) => {
                     let result = q

crates/webr-db/src/pool.rs

@@ -71,7 +71,7 @@ impl DbPool {
         #[allow(unused_variables)]
         let idle_timeout = Duration::from_secs(pool_cfg.idle_timeout_secs);
 
-        match config.driver.as_str() {
+        match config.resolve_driver()? {
             #[cfg(feature = "postgres")]
             "postgres" => {
                 let pg_pool = sqlx::postgres::PgPoolOptions::new()
@@ -136,7 +136,7 @@ impl DbPool {
     /// # Panics
     /// Panics if the driver is not PostgreSQL.
     #[cfg(feature = "postgres")]
-    pub fn as_pg(&self) -> &sqlx::PgPool {
+    pub(crate) fn as_pg(&self) -> &sqlx::PgPool {
         #[allow(unreachable_patterns)]
         match &self.inner {
             PoolInner::Postgres(p) => p,
@@ -148,7 +148,7 @@ impl DbPool {
     /// # Panics
     /// Panics if the driver is not MySQL.
     #[cfg(feature = "mysql")]
-    pub fn as_my(&self) -> &sqlx::MySqlPool {
+    pub(crate) fn as_my(&self) -> &sqlx::MySqlPool {
         #[allow(unreachable_patterns)]
         match &self.inner {
             PoolInner::MySql(p) => p,
@@ -160,7 +160,7 @@ impl DbPool {
     /// # Panics
     /// Panics if the driver is not SQLite.
     #[cfg(feature = "sqlite")]
-    pub fn as_sq(&self) -> &sqlx::SqlitePool {
+    pub(crate) fn as_sq(&self) -> &sqlx::SqlitePool {
         #[allow(unreachable_patterns)]
         match &self.inner {
             PoolInner::Sqlite(p) => p,

crates/webr-db/src/transaction.rs

@@ -121,7 +121,7 @@ impl DbTransaction {
     /// Panics if the driver is not PostgreSQL.
     #[cfg(feature = "postgres")]
     #[allow(clippy::wrong_self_convention)]
-    pub fn as_pg(guard: &mut TxnInner) -> &mut sqlx::PgConnection {
+    pub(crate) fn as_pg(guard: &mut TxnInner) -> &mut sqlx::PgConnection {
         #[allow(unreachable_patterns)]
         match guard {
             TxnInner::Postgres(tx) => &mut **tx,
@@ -134,7 +134,7 @@ impl DbTransaction {
     /// Panics if the driver is not MySQL.
     #[cfg(feature = "mysql")]
     #[allow(clippy::wrong_self_convention)]
-    pub fn as_my(guard: &mut TxnInner) -> &mut sqlx::MySqlConnection {
+    pub(crate) fn as_my(guard: &mut TxnInner) -> &mut sqlx::MySqlConnection {
         #[allow(unreachable_patterns)]
         match guard {
             TxnInner::MySql(tx) => &mut **tx,
@@ -147,7 +147,7 @@ impl DbTransaction {
     /// Panics if the driver is not SQLite.
     #[cfg(feature = "sqlite")]
     #[allow(clippy::wrong_self_convention)]
-    pub fn as_sq(guard: &mut TxnInner) -> &mut sqlx::SqliteConnection {
+    pub(crate) fn as_sq(guard: &mut TxnInner) -> &mut sqlx::SqliteConnection {
         #[allow(unreachable_patterns)]
         match guard {
             TxnInner::Sqlite(tx) => &mut **tx,

crates/webr-db/tests/db_tests.rs

@@ -18,21 +18,19 @@ fn pool_config_default_values() {
 #[test]
 fn resolve_url_returns_url_unchanged_when_no_credentials() {
     let cfg = DatasourceConfig {
-        driver: "sqlite".into(),
         url: "sqlite:///tmp/explicit.db".into(),
-        username: None,
+        user: None,
         password: None,
         pool: PoolConfig::default(),
     };
     assert_eq!(cfg.resolve_url().unwrap(), "sqlite:///tmp/explicit.db");
 }
 
 #[test]
-fn resolve_url_merges_username_and_password() {
+fn resolve_url_merges_user_and_password() {
     let cfg = DatasourceConfig {
-        driver: "postgres".into(),
         url: "postgres://host:5432/mydb".into(),
-        username: Some("admin".into()),
+        user: Some("admin".into()),
         password: Some("secret".into()),
         pool: PoolConfig::default(),
     };
@@ -43,11 +41,10 @@ fn resolve_url_merges_username_and_password() {
 }
 
 #[test]
-fn resolve_url_merges_username_only() {
+fn resolve_url_merges_user_only() {
     let cfg = DatasourceConfig {
-        driver: "postgres".into(),
         url: "postgres://host:5432/mydb".into(),
-        username: Some("admin".into()),
+        user: Some("admin".into()),
         password: None,
         pool: PoolConfig::default(),
     };
@@ -60,9 +57,8 @@ fn resolve_url_merges_username_only() {
 #[test]
 fn resolve_url_replaces_existing_credentials() {
     let cfg = DatasourceConfig {
-        driver: "postgres".into(),
         url: "postgres://old:oldpass@host:5432/mydb?sslmode=require".into(),
-        username: Some("new".into()),
+        user: Some("new".into()),
         password: Some("newpass".into()),
         pool: PoolConfig::default(),
     };
@@ -75,9 +71,8 @@ fn resolve_url_replaces_existing_credentials() {
 #[test]
 fn resolve_url_returns_url_without_scheme_unchanged() {
     let cfg = DatasourceConfig {
-        driver: "sqlite".into(),
         url: "just-a-path.db".into(),
-        username: Some("user".into()),
+        user: Some("user".into()),
         password: Some("pass".into()),
         pool: PoolConfig::default(),
     };

crates/webr-db/tests/pool_tests.rs

@@ -17,9 +17,8 @@ struct Todo {
 /// Build a SQLite in-memory pool.
 async fn test_pool() -> DbPool {
     let cfg = DatasourceConfig {
-        driver: "sqlite".into(),
         url: "sqlite::memory:".into(),
-        username: None,
+        user: None,
         password: None,
         pool: PoolConfig::default(),
     };
@@ -336,9 +335,8 @@ async fn scope_txn_exposes_transaction_via_try_get_txn() {
 #[tokio::test]
 async fn from_config_unsupported_driver_returns_error() {
     let cfg = DatasourceConfig {
-        driver: "oracle".into(),
-        url: "jdbc:oracle:thin:@localhost:1521/xe".into(),
-        username: None,
+        url: "oracle://localhost/xe".into(),
+        user: None,
         password: None,
         pool: PoolConfig::default(),
     };

examples/orm/config/application.toml

@@ -6,5 +6,4 @@ host = "0.0.0.0"
 level = "debug"
 
 [datasource]
-driver = "sqlite"
 url = "sqlite://todos.db?mode=rwc"

src/auto_init.rs

@@ -19,14 +19,21 @@ pub async fn auto_init(app: &mut AppBuilder) -> Result<(), Error> {
     #[cfg(feature = "auto-init")]
     {
         // Auto-initialize cache if configured
-        #[cfg(any(feature = "cache-memory", feature = "cache-sled", feature = "cache-redis"))]
+        #[cfg(any(
+            feature = "cache-memory",
+            feature = "cache-sled",
+            feature = "cache-redis"
+        ))]
         {
             if let Ok(cache_config) = app.config().get::<webr_cache::CacheConfig>("cache") {
                 let cache = crate::cache_adapter::Cache::from_config(&cache_config)
                     .await
                     .map_err(crate::__cache_error)?;
                 app.provide(cache)?;
-                tracing::info!("Cache auto-initialized with backend: {}", cache_config.backend);
+                tracing::info!(
+                    "Cache auto-initialized with backend: {}",
+                    cache_config.backend
+                );
             }
         }
 
@@ -42,7 +49,7 @@ pub async fn auto_init(app: &mut AppBuilder) -> Result<(), Error> {
                 app.provide(pool)?;
                 tracing::info!(
                     "Database pool auto-initialized with driver: {}",
-                    ds_config.driver
+                    ds_config.resolve_driver().unwrap_or("unknown")
                 );
             }
         }

src/db_adapter.rs

@@ -13,9 +13,9 @@ use webr_core::component::Component;
 /// Implements [`Component`] so the pool can be registered with
 /// `app.provide(pool)` and injected via `Inject<DbPool>`.
 ///
-/// Derefs to the inner [`webr_db::DbPool`], so all pool methods
-/// (`as_pg`, `as_my`, `as_sq`, `driver`, `placeholder`, …) are
-/// available without explicit delegation.
+/// Derefs to the inner [`webr_db::DbPool`], so the public pool API
+/// (`driver`, `placeholder`, `query_as`, `fetch_all`, …) is available
+/// without explicit delegation.
 pub struct DbPool(webr_db::DbPool);
 
 impl DbPool {