✨ Rewrite database proxy that supports cloudflare D1.

examples/guest-side/Cargo.toml

@@ -15,7 +15,7 @@ anyhow = "^1"
 tokio = { version = "^1", features = ["macros", "rt", "time"] }
 
 sqlparser = "^0.45"
-sea-orm = { version = "1.0.0-rc.4", features = ["proxy"] }
+sea-orm = { version = "1.0.0-rc.7", features = ["proxy"] }
 yew = { version = "^0.21", features = ["ssr"] }
 yew-router = "^0.18"
 

examples/host-side/Cargo.toml

@@ -17,5 +17,5 @@ serde_json = "^1"
 async-std = { version = "^1", features = ["attributes", "tokio1"] }
 uuid = "^1"
 
-sea-orm = { version = "1.0.0-rc.4", features = ["proxy"] }
+sea-orm = { version = "1.0.0-rc.7", features = ["proxy"] }
 gluesql = { version = "^0.15" }

packages/database/Cargo.toml

@@ -22,17 +22,27 @@ uuid = { version = "^1", features = [
   'serde',
 ] }
 
-sea-orm-migration = "1.0.0-rc.4"
+sea-orm-migration = "1.0.0-rc.7"
 serde = { version = "^1", features = ["derive"] }
 serde_json = "^1"
 async-std = { version = "^1", features = ["attributes", "tokio1"] }
 
+
 [dependencies.sea-orm]
-features = [
-  "sqlx-mysql",
-  "runtime-async-std-rustls",
-  "with-uuid",
-  "with-chrono",
-  "with-json",
+features = ["with-uuid", "with-chrono", "with-json"]
+version = "1.0.0-rc.7"
+
+[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies]
+wasm-bindgen = { version = "0.2.87", optional = true }
+wasm-bindgen-futures = { version = "^0.4", optional = true }
+worker = { version = "0.3.0", features = ["d1"], optional = true }
+
+[features]
+default = ["cloudflare"]
+cloudflare = [
+  "dep:wasm-bindgen",
+  "dep:wasm-bindgen-futures",
+  "dep:worker",
+  "sea-orm/proxy",
+  "sea-orm/sqlx-sqlite",
 ]
-version = "1.0.0-rc.4"

packages/database/src/lib.rs

@@ -1,101 +1 @@
-pub mod functions;
-pub mod models;
-
-use anyhow::Result;
-use async_std::sync::Mutex;
-use lazy_static::lazy_static;
-use log::info;
-use std::{cell::Cell, time::Duration};
-
-use sea_orm::{ConnectOptions, ConnectionTrait, Database, DatabaseConnection, Schema, Statement};
-
-pub struct DatabaseNetworkConfig {
-    pub host: String,
-    pub port: u16,
-    pub username: String,
-    pub password: String,
-    pub database: String,
-}
-
-pub async fn init(config: DatabaseNetworkConfig) -> Result<()> {
-    // Connect to the database
-    let mut opt = ConnectOptions::new(format!(
-        "mysql://{}:{}@{}:{}/mysql",
-        config.username, config.password, config.host, config.port
-    ));
-    opt.max_connections(100)
-        .min_connections(5)
-        .connect_timeout(Duration::from_secs(8))
-        .acquire_timeout(Duration::from_secs(8))
-        .idle_timeout(Duration::from_secs(8))
-        .max_lifetime(Duration::from_secs(8))
-        .sqlx_logging(true)
-        .sqlx_logging_level(log::LevelFilter::Trace);
-    let db = Database::connect(opt).await?;
-    let builder = db.get_database_backend();
-
-    // Initialize the database
-    db.execute(Statement::from_string(
-        db.get_database_backend(),
-        format!(
-            "CREATE DATABASE IF NOT EXISTS {} DEFAULT CHARACTER SET utf8mb4;",
-            config.database
-        ),
-    ))
-    .await?;
-    db.execute(Statement::from_string(
-        db.get_database_backend(),
-        format!("USE {}", config.database),
-    ))
-    .await?;
-
-    db.execute(
-        builder.build(
-            Schema::new(builder)
-                .create_table_from_entity(models::channel::Entity)
-                .if_not_exists(),
-        ),
-    )
-    .await?;
-    db.execute(
-        builder.build(
-            Schema::new(builder)
-                .create_table_from_entity(models::user::Entity)
-                .if_not_exists(),
-        ),
-    )
-    .await?;
-    db.execute(
-        builder.build(
-            Schema::new(builder)
-                .create_table_from_entity(models::tag::Entity)
-                .if_not_exists(),
-        ),
-    )
-    .await?;
-    db.execute(
-        builder.build(
-            Schema::new(builder)
-                .create_table_from_entity(models::thread::Entity)
-                .if_not_exists(),
-        ),
-    )
-    .await?;
-    db.execute(
-        builder.build(
-            Schema::new(builder)
-                .create_table_from_entity(models::post::Entity)
-                .if_not_exists(),
-        ),
-    )
-    .await?;
-
-    info!("Database is ready");
-    DB_CONN.lock().await.replace(db);
-
-    Ok(())
-}
-
-lazy_static! {
-    static ref DB_CONN: Mutex<Cell<DatabaseConnection>> = Default::default();
-}
+pub mod providers;