Make ConnectionCreator async and take label

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

crates/factor-sqlite/src/host.rs

@@ -68,7 +68,8 @@ impl v2::HostConnection for InstanceState {
         }
         let conn = (self.get_connection_creator)(&database)
             .ok_or(v2::Error::NoSuchDatabase)?
-            .create_connection()?;
+            .create_connection(&database)
+            .await?;
         self.connections
             .push(conn)
             .map_err(|()| v2::Error::Io("too many connections opened".to_string()))

crates/factor-sqlite/src/lib.rs

@@ -168,8 +168,13 @@ impl AppState {
     /// Get a connection for a given database label.
     ///
     /// Returns `None` if there is no connection creator for the given label.
-    pub fn get_connection(&self, label: &str) -> Option<Result<Box<dyn Connection>, v2::Error>> {
-        let connection = (self.get_connection_creator)(label)?.create_connection();
+    pub async fn get_connection(
+        &self,
+        label: &str,
+    ) -> Option<Result<Box<dyn Connection>, v2::Error>> {
+        let connection = (self.get_connection_creator)(label)?
+            .create_connection(label)
+            .await;
         Some(connection)
     }
 
@@ -182,18 +187,27 @@ impl AppState {
 }
 
 /// A creator of a connections for a particular SQLite database.
+#[async_trait]
 pub trait ConnectionCreator: Send + Sync {
     /// Get a *new* [`Connection`]
     ///
     /// The connection should be a new connection, not a reused one.
-    fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error>;
+    async fn create_connection(
+        &self,
+        label: &str,
+    ) -> Result<Box<dyn Connection + 'static>, v2::Error>;
 }
 
+#[async_trait]
 impl<F> ConnectionCreator for F
 where
     F: Fn() -> anyhow::Result<Box<dyn Connection + 'static>> + Send + Sync + 'static,
 {
-    fn create_connection(&self) -> Result<Box<dyn Connection + 'static>, v2::Error> {
+    async fn create_connection(
+        &self,
+        label: &str,
+    ) -> Result<Box<dyn Connection + 'static>, v2::Error> {
+        let _ = label;
         (self)().map_err(|_| v2::Error::InvalidConnection)
     }
 }

crates/factor-sqlite/tests/factor_test.rs

@@ -8,6 +8,7 @@ use spin_factors::{
 };
 use spin_factors_test::{toml, TestEnvironment};
 use spin_sqlite::RuntimeConfigResolver;
+use spin_world::async_trait;
 
 #[derive(RuntimeFactors)]
 struct TestFactors {
@@ -143,11 +144,14 @@ impl spin_factor_sqlite::DefaultLabelResolver for DefaultLabelResolver {
 /// A connection creator that always returns an error.
 struct InvalidConnectionCreator;
 
+#[async_trait]
 impl spin_factor_sqlite::ConnectionCreator for InvalidConnectionCreator {
-    fn create_connection(
+    async fn create_connection(
         &self,
+        label: &str,
     ) -> Result<Box<dyn spin_factor_sqlite::Connection + 'static>, spin_world::v2::sqlite::Error>
     {
+        let _ = label;
         Err(spin_world::v2::sqlite::Error::InvalidConnection)
     }
 }