Fix: Implement p3-runtime wrt wasip3 crate

Signed-off-by: Aditya <aditya.salunkh919@gmail.com>

Author: Aditya1404Sal

Cargo.lock

@@ -186,7 +186,7 @@ mac_address = "1.1.5"
 rust_decimal = { version = "1.26.1", default-features = false, features = ["std"] }
 time = { version = "0.3.36", features = ["formatting", "parsing", "macros"] }
 uuid = "1.1.2"
-
+tokio-util = { version = "*" }
 # Common utility crates
 cfg-if = "1.0.0"
 dotenvy = { version = "0.15.0", default-features = false }
@@ -208,7 +208,7 @@ default-features = false
 
 [workspace.dependencies.tokio]
 version = "1"
-features = ["time", "net", "sync", "fs", "io-util", "rt"]
+features = ["time", "sync", "io-util", "rt"]
 default-features = false
 
 [dependencies]
@@ -255,6 +255,9 @@ cast_sign_loss = 'deny'
 # See `clippy.toml`
 disallowed_methods = 'deny'
 
+[patch.crates-io]
+whoami = { git = "https://github.com/Aditya1404Sal/whoami", branch = "v2" }
+
 
 [lints.rust.unexpected_cfgs]
 level = 'warn'

Cargo.toml

@@ -4,8 +4,17 @@ version = "0.1.0"
 edition = "2021"
 workspace = "../../../"
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 anyhow = "1.0"
-sqlx = { path = "../../../", features = [ "mysql", "runtime-tokio", "tls-native-tls" ] }
+futures = "0.3"
+sqlx = { path = "../../../", features = [ "mysql", "runtime-tokio" ] }
 clap = { version = "4", features = ["derive"] }
-tokio = { version = "1.20.0", features = ["rt", "macros"]}
+tokio = { version = "1.20.0", features = ["rt"]}
+dotenvy = "0.15.0"
+wasip3 = "0.2.0+wasi-0.3.0-rc-2025-09-16"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+sqlx = { path = "../../../", features = ["tls-native-tls"] }

examples/mysql/todos/Cargo.toml

@@ -14,27 +14,26 @@ enum Command {
     Done { id: u64 },
 }
 
-#[tokio::main(flavor = "current_thread")]
-async fn main() -> anyhow::Result<()> {
-    let args = Args::parse();
+async fn run() -> anyhow::Result<()> {
+    let args = Args::parse_from(wasip3::cli::environment::get_arguments());
     let pool = MySqlPool::connect(&env::var("DATABASE_URL")?).await?;
 
     match args.cmd {
         Some(Command::Add { description }) => {
-            println!("Adding new todo with description '{description}'");
+            eprintln!("Adding new todo with description '{description}'");
             let todo_id = add_todo(&pool, description).await?;
-            println!("Added new todo with id {todo_id}");
+            eprintln!("Added new todo with id {todo_id}");
         }
         Some(Command::Done { id }) => {
-            println!("Marking todo {id} as done");
+            eprintln!("Marking todo {id} as done");
             if complete_todo(&pool, id).await? {
-                println!("Todo {id} is marked as done");
+                eprintln!("Todo {id} is marked as done");
             } else {
-                println!("Invalid id {id}");
+                eprintln!("Invalid id {id}");
             }
         }
         None => {
-            println!("Printing list of all todos");
+            eprintln!("Printing list of all todos");
             list_todos(&pool).await?;
         }
     }
@@ -43,7 +42,6 @@ async fn main() -> anyhow::Result<()> {
 }
 
 async fn add_todo(pool: &MySqlPool, description: String) -> anyhow::Result<u64> {
-    // Insert the task, then obtain the ID of this row
     let todo_id = sqlx::query!(
         r#"
 INSERT INTO todos ( description )
@@ -85,10 +83,8 @@ ORDER BY id
     .fetch_all(pool)
     .await?;
 
-    // NOTE: Booleans in MySQL are stored as `TINYINT(1)` / `i8`
-    //       0 = false, non-0 = true
     for rec in recs {
-        println!(
+        eprintln!(
             "- [{}] {}: {}",
             if rec.done != 0 { "x" } else { " " },
             rec.id,
@@ -98,3 +94,27 @@ ORDER BY id
 
     Ok(())
 }
+
+wasip3::cli::command::export!(Component);
+
+struct Component;
+
+impl wasip3::exports::cli::run::Guest for Component {
+    async fn run() -> Result<(), ()> {
+        if let Err(err) = run().await {
+            let (mut tx, rx) = wasip3::wit_stream::new();
+
+            futures::join!(
+                async { wasip3::cli::stderr::write_via_stream(rx).await.unwrap() },
+                async {
+                    let remaining = tx.write_all(format!("{err:#}\n").into_bytes()).await;
+                    assert!(remaining.is_empty());
+                    drop(tx);
+                }
+            );
+            Err(())
+        } else {
+            Ok(())
+        }
+    }
+}

examples/mysql/todos/src/main.rs renamed to examples/mysql/todos/src/lib.rs

@@ -50,7 +50,8 @@ _unstable-doc = ["sqlx-toml"]
 async-global-executor = { workspace = true, optional = true }
 async-std = { workspace = true, optional = true }
 smol = { workspace = true, optional = true }
-tokio = { workspace = true, optional = true }
+tokio = { workspace = true, optional = true, features = ["sync","rt"]}
+tokio-util = { workspace = true }
 
 # TLS
 native-tls = { version = "0.2.10", optional = true }
@@ -94,18 +95,26 @@ toml = { version = "0.8.16", optional = true }
 sha2 = { version = "0.10.0", default-features = false, optional = true }
 #sqlformat = "0.2.0"
 thiserror = "2.0.0"
-tokio-stream = { version = "0.1.8", features = ["fs"], optional = true }
+tokio-stream = { version = "0.1.8", optional = true }
 tracing = { version = "0.1.37", features = ["log"] }
 smallvec = "1.7.0"
 url = { version = "2.2.2" }
 bstr = { version = "1.0", default-features = false, features = ["std"], optional = true }
 hashlink = "0.10.0"
 indexmap = "2.0"
 event-listener = "5.2.0"
-hashbrown = "0.15.0"
-wasip3 = { workspace = true}
+hashbrown = { version = "0.15.0", default-features = false }
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+tokio = { workspace = true, features = ["sync", "rt"] }
+tokio-util = { workspace = true }
+wasip3 = { workspace = true }
 wit-bindgen = { workspace = true, optional = true }
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+tokio = { workspace = true, features = ["net", "fs"], optional = true }
+tokio-stream = { version = "0.1.8", features = ["fs"], optional = true }
+
+
 [dev-dependencies]
 sqlx = { workspace = true, features = ["postgres", "sqlite", "mysql", "migrate", "macros", "time", "uuid"] }
 tokio = { version = "1", features = ["rt"] }

sqlx-core/Cargo.toml

@@ -37,19 +37,7 @@ impl<'s> MigrationSource<'s> for &'s Path {
 
 impl MigrationSource<'static> for PathBuf {
     fn resolve(self) -> BoxFuture<'static, Result<Vec<Migration>, BoxDynError>> {
-        // Technically this could just be `Box::pin(spawn_blocking(...))`
-        // but that would actually be a breaking behavior change because it would call
-        // `spawn_blocking()` on the current thread
-        Box::pin(async move {
-            crate::rt::spawn_blocking(move || {
-                #[cfg(not(target_arch = "wasm32"))]
-                let migrations_with_paths = resolve_blocking(&self)?;
-                #[cfg(target_arch = "wasm32")]
-                let migrations_with_paths = resolve(&canonical).await?;
-                Ok(migrations_with_paths.into_iter().map(|(m, _p)| m).collect())
-            })
-            .await
-        })
+        Box::pin(async move { self.as_path().resolve().await })
     }
 }
 

sqlx-core/src/migrate/source.rs

@@ -186,6 +186,12 @@ pub async fn connect_tcp<Ws: WithSocket>(
     port: u16,
     with_socket: Ws,
 ) -> crate::Result<Ws::Output> {
+    #[cfg(all(feature = "_rt-tokio", target_arch = "wasm32"))]
+    {
+        let res = crate::rt::rt_wasip3::connect_tcp(host, port, with_socket).await;
+        return res;
+    }
+
     #[cfg(all(feature = "_rt-tokio", not(target_arch = "wasm32")))]
     if crate::rt::rt_tokio::available() {
         return Ok(with_socket
@@ -200,12 +206,6 @@ pub async fn connect_tcp<Ws: WithSocket>(
             crate::rt::missing_rt((host, port, with_socket))
         }
     }
-
-    #[cfg(all(feature = "_rt-tokio", target_arch = "wasm32"))]
-    {
-        let res = crate::rt::rt_wasip3::connect_tcp(host, port, with_socket).await;
-        return res;
-    }
 }
 
 /// Open a TCP socket to `host` and `port`.