Print close warning at most once

Author: gammelalf

src/database.rs

@@ -2,6 +2,8 @@
 This module defines the main API wrapper.
 */
 
+use std::sync::Arc;
+
 use log::{debug, warn, LevelFilter};
 use rorm_declaration::config::DatabaseDriver;
 use rorm_sql::delete::Delete;
@@ -96,14 +98,17 @@ Main API wrapper.
 All operations can be started with methods of this struct.
  */
 #[derive(Clone)]
-pub struct Database(pub(crate) internal::database::Impl);
+pub struct Database(pub(crate) internal::database::Impl, Arc<()>);
 
 impl Database {
     /**
     Connect to the database using `configuration`.
      */
     pub async fn connect(configuration: DatabaseConfiguration) -> Result<Self, Error> {
-        internal::database::connect(configuration).await
+        Ok(Self(
+            internal::database::connect(configuration).await?,
+            Arc::new(()),
+        ))
     }
 
     /**
@@ -146,7 +151,10 @@ impl Database {
 
 impl Drop for Database {
     fn drop(&mut self) {
-        if !internal::database::is_closed(self) {
+        // The use of strong_count should be correct:
+        // - the arc is private and we don't create WeakRefs
+        // => when observing a strong_count of 1, there can't be any remaining refs
+        if Arc::strong_count(&self.1) == 1 && !internal::database::is_closed(self) {
             warn!("Database has been dropped without calling close. This might case the last queries to not being flushed properly");
         }
     }

src/dummy_impl/database.rs

@@ -9,7 +9,7 @@ use crate::transaction::Transaction;
 pub(crate) type Impl = NotInstantiable;
 
 /// Implementation of [Database::connect]
-pub(crate) async fn connect(_configuration: DatabaseConfiguration) -> Result<Database, Error> {
+pub(crate) async fn connect(_configuration: DatabaseConfiguration) -> Result<Impl, Error> {
     no_sqlx();
 }
 

src/sqlx_impl/database.rs

@@ -20,7 +20,7 @@ pub(crate) type Impl = AnyPool;
 const SLOW_STATEMENTS: Duration = Duration::from_millis(300);
 
 /// Implementation of [Database::connect]
-pub(crate) async fn connect(configuration: DatabaseConfiguration) -> Result<Database, Error> {
+pub(crate) async fn connect(configuration: DatabaseConfiguration) -> Result<Impl, Error> {
     if configuration.max_connections < configuration.min_connections {
         return Err(Error::ConfigurationError(String::from(
             "max_connections must not be less than min_connections",
@@ -139,7 +139,7 @@ pub(crate) async fn connect(configuration: DatabaseConfiguration) -> Result<Data
         }
     };
 
-    Ok(Database(pool))
+    Ok(pool)
 }
 
 /// Implementation of [Database::raw_sql]