diff --git a/cuddle-rust-service/.env b/cuddle-rust-service/.env index 119ed0d..8b13789 100644 --- a/cuddle-rust-service/.env +++ b/cuddle-rust-service/.env @@ -1 +1 @@ - DATABASE_URL="postgres://root@localhost:26257/defaultdb?sslmode=disable" + diff --git a/cuddle-rust-service/crates/%%name%%/Cargo.toml b/cuddle-rust-service/crates/%%name%%/Cargo.toml index 9f7da15..765a9ce 100644 --- a/cuddle-rust-service/crates/%%name%%/Cargo.toml +++ b/cuddle-rust-service/crates/%%name%%/Cargo.toml @@ -13,6 +13,5 @@ dotenv.workspace = true axum.workspace = true serde = { version = "1.0.197", features = ["derive"] } -sqlx = { version = "0.7.3", features = ["runtime-tokio", "tls-rustls", "postgres", "uuid", "time"] } uuid = { version = "1.7.0", features = ["v4"] } tower-http = { version = "0.5.2", features = ["cors", "trace"] } diff --git a/cuddle-rust-service/crates/%%name%%/migrations/crdb/20240201211013_initial.sql b/cuddle-rust-service/crates/%%name%%/migrations/crdb/20240201211013_initial.sql deleted file mode 100644 index 8ddc1d3..0000000 --- a/cuddle-rust-service/crates/%%name%%/migrations/crdb/20240201211013_initial.sql +++ /dev/null @@ -1 +0,0 @@ --- Add migration script here diff --git a/cuddle-rust-service/crates/%%name%%/src/main.rs b/cuddle-rust-service/crates/%%name%%/src/main.rs index 5cd06ec..9d82372 100644 --- a/cuddle-rust-service/crates/%%name%%/src/main.rs +++ b/cuddle-rust-service/crates/%%name%%/src/main.rs @@ -82,25 +82,11 @@ impl Deref for SharedState { } } -pub struct State { - pub db: Pool, -} +pub struct State {} impl State { pub async fn new() -> anyhow::Result { - let db = sqlx::PgPool::connect( - &std::env::var("DATABASE_URL").context("DATABASE_URL is not set")?, - ) - .await?; - - sqlx::migrate!("migrations/crdb") - .set_locking(false) - .run(&db) - .await?; - - let _ = sqlx::query("SELECT 1;").fetch_one(&db).await?; - - Ok(Self { db }) + Ok(Self {}) } } diff --git a/cuddle-rust-service/templates/docker-compose.yaml b/cuddle-rust-service/templates/docker-compose.yaml deleted file mode 100644 index 8fae72a..0000000 --- a/cuddle-rust-service/templates/docker-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ -version: "3" -services: - crdb: - restart: 'always' - image: 'cockroachdb/cockroach:v23.1.14' - command: 'start-single-node --advertise-addr 0.0.0.0 --insecure' - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/health?ready=1"] - interval: '10s' - timeout: '30s' - retries: 5 - start_period: '20s' - ports: - - 8080:8080 - - '26257:26257'