Move server_version_num from trait to impl (#1384)

* refactor(core): move `fn server_version_num` from `trait PgConnectionInfo` to impl

Signed-off-by: Atkins Chang <[email protected]>

* fix rebase issues

Co-authored-by: Austin Bonander <[email protected]>

Author: AtkinsChang

Cargo.lock

@@ -67,6 +67,11 @@ pub struct PgConnection {
 }
 
 impl PgConnection {
+    /// the version number of the server in `libpq` format
+    pub fn server_version_num(&self) -> Option<u32> {
+        self.stream.server_version_num
+    }
+
     // will return when the connection is ready for another query
     pub(in crate::postgres) async fn wait_until_ready(&mut self) -> Result<(), Error> {
         if !self.stream.wbuf.is_empty() {
@@ -187,20 +192,3 @@ impl Connection for PgConnection {
         !self.stream.wbuf.is_empty()
     }
 }
-
-pub trait PgConnectionInfo {
-    /// the version number of the server in `libpq` format
-    fn server_version_num(&self) -> Option<u32>;
-}
-
-impl PgConnectionInfo for PgConnection {
-    fn server_version_num(&self) -> Option<u32> {
-        self.stream.server_version_num
-    }
-}
-
-impl PgConnectionInfo for crate::pool::PoolConnection<Postgres> {
-    fn server_version_num(&self) -> Option<u32> {
-        self.stream.server_version_num
-    }
-}

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

@@ -27,7 +27,7 @@ mod migrate;
 pub use advisory_lock::{PgAdvisoryLock, PgAdvisoryLockGuard, PgAdvisoryLockKey};
 pub use arguments::{PgArgumentBuffer, PgArguments};
 pub use column::PgColumn;
-pub use connection::{PgConnection, PgConnectionInfo};
+pub use connection::PgConnection;
 pub use copy::PgCopyIn;
 pub use database::Postgres;
 pub use error::{PgDatabaseError, PgErrorPosition};

sqlx-core/src/postgres/mod.rs

@@ -1,8 +1,8 @@
 use futures::{StreamExt, TryStreamExt};
 use sqlx::postgres::types::Oid;
 use sqlx::postgres::{
-    PgAdvisoryLock, PgConnectOptions, PgConnection, PgConnectionInfo, PgDatabaseError,
-    PgErrorPosition, PgListener, PgPoolOptions, PgRow, PgSeverity, Postgres,
+    PgAdvisoryLock, PgConnectOptions, PgConnection, PgDatabaseError, PgErrorPosition, PgListener,
+    PgPoolOptions, PgRow, PgSeverity, Postgres,
 };
 use sqlx::{Column, Connection, Executor, Row, Statement, TypeInfo};
 use sqlx_test::{new, pool, setup_if_needed};
@@ -1202,8 +1202,6 @@ VALUES
 
 #[sqlx_macros::test]
 async fn test_pg_server_num() -> anyhow::Result<()> {
-    use sqlx::postgres::PgConnectionInfo;
-
     let conn = new::<Postgres>().await?;
 
     assert!(conn.server_version_num().is_some());