sqldb: move from diesel to sqlx

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

Cargo.lock

@@ -2,6 +2,7 @@
 // Copyright (c) 2023-2025 Rust Nostr Developers
 // Distributed under the MIT software license
 
+use std::time::Duration;
 use nostr_sdk::prelude::*;
 
 #[tokio::main]
@@ -11,9 +12,7 @@ async fn main() -> Result<()> {
     let keys = Keys::parse("nsec1ufnus6pju578ste3v90xd5m2decpuzpql2295m3sknqcjzyys9ls0qlc85")?;
     let client = Client::new(keys);
 
-    client.add_relay("wss://relay.damus.io").await?;
-    client.add_relay("wss://nostr.wine").await?;
-    client.add_relay("wss://relay.rip").await?;
+    client.add_relay("ws://127.0.0.1:17445").await?;
 
     client.connect().await;
 
@@ -23,16 +22,14 @@ async fn main() -> Result<()> {
     println!("Event ID: {}", output.id().to_bech32()?);
     println!("Sent to: {:?}", output.success);
     println!("Not sent to: {:?}", output.failed);
-
-    // Create a text note POW event to relays
-    let builder = EventBuilder::text_note("POW text note from rust-nostr").pow(20);
-    client.send_event_builder(builder).await?;
-
-    // Send a text note POW event to specific relays
-    let builder = EventBuilder::text_note("POW text note from rust-nostr 16").pow(16);
-    client
-        .send_event_builder_to(["wss://relay.damus.io", "wss://relay.rip"], builder)
+    
+    let events = client
+        .fetch_events(Filter::new().kind(Kind::TextNote), Duration::from_secs(10))
         .await?;
 
+    for event in events {
+        println!("{}", event.as_json())
+    }
+    
     Ok(())
 }

crates/nostr-sdk/examples/client.rs

@@ -11,35 +11,35 @@ readme = "README.md"
 rust-version.workspace = true
 keywords = ["nostr", "database", "postgres", "mysql", "sqlite"]
 
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
 [features]
-default = ["postgres"]
-postgres = [
-  "diesel/postgres",
-  "diesel-async/postgres",
-  "diesel_migrations/postgres",
-]
-mysql = ["diesel/mysql", "diesel-async/mysql", "diesel_migrations/mysql"]
-sqlite = [
-  "diesel/sqlite",
-  "diesel-async/sqlite",
-  "diesel_migrations/sqlite",
-  "diesel/returning_clauses_for_sqlite_3_35",
-]
+default = ["sqlite"]
+# Enable SQLite support
+sqlite = ["sqlx/sqlite"]
+# Enable Postgres support
+postgres = ["sqlx/postgres", "sqlx/tls-rustls-ring-webpki"]
+# Enable MySQL/MariaDB support
+mysql = ["sqlx/mysql", "sqlx/tls-rustls-ring-webpki"]
 
 [dependencies]
-deadpool = { version = "0.12", features = ["managed", "rt_tokio_1"] }
-diesel = { version = "2.2", features = ["serde_json"] }
-diesel-async = { version = "0.5", features = ["deadpool"] }
-diesel_migrations = "2.2"
 nostr = { workspace = true, features = ["std"] }
 nostr-database = { workspace = true, features = ["flatbuf"] }
-tracing.workspace = true
+sqlx = { version = "0.8", features = ["any", "migrate", "runtime-tokio"] }
+tokio = { workspace = true, features = ["sync"] }
 
 [dev-dependencies]
 nostr-relay-builder.workspace = true
+tempfile.workspace = true
 tokio.workspace = true
 tracing-subscriber.workspace = true
 
 [[example]]
 name = "postgres-relay"
 required-features = ["postgres"]
+
+[[example]]
+name = "sqlite-relay"
+required-features = ["sqlite"]

database/nostr-sqldb/Cargo.toml

@@ -0,0 +1,7 @@
+// Copyright (c) 2022-2023 Yuki Kishimoto
+// Copyright (c) 2023-2025 Rust Nostr Developers
+// Distributed under the MIT software license
+
+fn main() {
+    println!("cargo:rerun-if-changed=migrations");
+}

database/nostr-sqldb/build.rs

@@ -1,21 +1,28 @@
-// Copyright (c) 2025 Protom
+// Copyright (c) 2022-2023 Yuki Kishimoto
+// Copyright (c) 2023-2025 Rust Nostr Developers
 // Distributed under the MIT software license
 
+
 use std::time::Duration;
 
 use nostr_database::prelude::*;
 use nostr_relay_builder::prelude::*;
-use nostr_sqldb::NostrPostgres;
-
-// Your database URL
-const DB_URL: &str = "postgres://postgres:password@localhost:5432";
+use nostr_sqldb::{NostrSql, NostrSqlBackend};
 
 #[tokio::main]
 async fn main() -> Result<()> {
     tracing_subscriber::fmt::init();
 
+    let backend = NostrSqlBackend::Postgres {
+        host: String::from("localhost"),
+        port: 5432,
+        username: Some(String::from("postgres")),
+        password: Some(String::from("password")),
+        database: String::from("nostr"),
+    };
+    
     // Create a nostr db instance and run pending db migrations if any
-    let db = NostrPostgres::new(DB_URL).await?;
+    let db = NostrSql::new(backend).await?;
 
     // Add db to builder
     let builder = RelayBuilder::default().database(db);

database/nostr-sqldb/examples/postgres-relay.rs

@@ -0,0 +1,32 @@
+// Copyright (c) 2022-2023 Yuki Kishimoto
+// Copyright (c) 2023-2025 Rust Nostr Developers
+// Distributed under the MIT software license
+
+
+use std::time::Duration;
+
+use nostr_database::prelude::*;
+use nostr_relay_builder::prelude::*;
+use nostr_sqldb::{NostrSql, NostrSqlBackend};
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    tracing_subscriber::fmt::init();
+
+    let backend = NostrSqlBackend::sqlite("nostr.db");
+
+    // Create a nostr db instance and run pending db migrations if any
+    let db = NostrSql::new(backend).await?;
+
+    // Add db to builder
+    let builder = RelayBuilder::default().database(db);
+
+    // Create local relay
+    let relay = LocalRelay::run(builder).await?;
+    println!("Url: {}", relay.url());
+
+    // Keep up the program
+    loop {
+        tokio::time::sleep(Duration::from_secs(60)).await;
+    }
+}

database/nostr-sqldb/examples/sqlite-relay.rs

@@ -1,5 +1,5 @@
 -- The actual event data
-CREATE TABLE IF NOT EXISTS events (
+CREATE TABLE events (
     id BLOB(32) PRIMARY KEY NOT NULL,
     pubkey BLOB(32) NOT NULL,
     created_at BIGINT NOT NULL,
@@ -15,7 +15,7 @@ CREATE INDEX event_kind ON events (kind);
 CREATE INDEX event_deleted ON events (deleted);
 
 -- The tag index, the primary will give us the index automatically
-CREATE TABLE IF NOT EXISTS event_tags (
+CREATE TABLE event_tags (
     tag VARCHAR(64) NOT NULL,
     tag_value VARCHAR(512) NOT NULL,
     event_id BLOB(32) NOT NULL