diff --git a/src/main.rs b/src/main.rs index 8ad295f..7a669ce 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,18 +1,3 @@ -//! Example of application using -//! -//! Run with -//! -//! ```not_rust -//! cargo run -p example-sqlx-postgres -//! ``` -//! -//! Test with curl: -//! -//! ```not_rust -//! curl 127.0.0.1:3000 -//! curl -X POST 127.0.0.1:3000 -//! ``` - use std::{net::SocketAddr, time::Duration}; use axum::{ @@ -22,11 +7,8 @@ use axum::{ routing::get, Router, }; -use sqlx::{ - sqlite::{SqliteConnectOptions, SqlitePool, SqlitePoolOptions}, - types::uuid::adapter::Hyphenated, -}; -use tokio::net::TcpListener; +use sqlx::sqlite::{SqliteConnectOptions, SqlitePool, SqlitePoolOptions}; +// use tokio::net::TcpListener; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] @@ -34,19 +16,29 @@ async fn main() { tracing_subscriber::registry() .with( tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_tokio_postgres=debug".into()), + .unwrap_or_else(|_| "ww_main=debug".into()), ) .with(tracing_subscriber::fmt::layer()) .init(); - let db_connection_str = std::env::var("DATABASE_URL") - .unwrap_or_else(|_| "postgres://postgres:password@localhost".to_string()); + let db_filename = { + std::env::var("DATABASE_FILE").unwrap_or_else(|_| { + let home = + std::env::var("HOME").expect("Could not determine $HOME for finding db file"); + format!("{home}/.witch-watch.db") + }) + }; + + let conn_opts = SqliteConnectOptions::new() + .foreign_keys(true) + .auto_vacuum(sqlx::sqlite::SqliteAutoVacuum::Incremental) + .filename(&db_filename); // setup connection pool let pool = SqlitePoolOptions::new() .max_connections(5) .connect_timeout(Duration::from_secs(3)) - .connect(&db_connection_str) + .connect_with(conn_opts) .await .expect("can't connect to database"); @@ -59,9 +51,9 @@ async fn main() { .with_state(pool); // run it with hyper - let listener = TcpListener::bind("127.0.0.1:3000").await.unwrap(); - tracing::debug!("listening on {}", listener.local_addr().unwrap()); + //let listener = TcpListener::bind("127.0.0.1:3000").await.unwrap(); //axum::serve(listener, app).await.unwrap(); + tracing::info!("binding to 0.0.0.0:3000"); axum::Server::bind(&SocketAddr::from(([0, 0, 0, 0], 3000))) .serve(app.into_make_service()) .await @@ -72,7 +64,7 @@ async fn main() { async fn using_connection_pool_extractor( State(pool): State, ) -> Result { - sqlx::query_scalar("select 'hello world from pg'") + sqlx::query_scalar("select 'hello world from sqlite get'") .fetch_one(&pool) .await .map_err(internal_error) @@ -103,7 +95,7 @@ async fn using_connection_extractor( DatabaseConnection(conn): DatabaseConnection, ) -> Result { let mut conn = conn; - sqlx::query_scalar("select 'hello world from pg'") + sqlx::query_scalar("select 'hello world from sqlite post'") .fetch_one(&mut conn) .await .map_err(internal_error)