Add postgres DB with diesel. Possibly this was a mistake.

.cargo/config.toml

@@ -1,2 +1,2 @@
 [env]
-STATIC_FILE_PATH = { value = "static", relative = true }
+LOCALHUB_STATIC_FILE_PATH = { value = "static", relative = true }

Cargo.toml

@@ -11,3 +11,5 @@ axum = "0.7"
 askama = "0.12"
 askama_axum = "0.4"
 tower-http = { version = "0.5", features = ["fs"] }
+diesel = { version = "2.1", features = ["postgres", "chrono"] }
+deadpool-diesel = {version = "0.5", features = ["postgres"]}

diesel.toml

@@ -0,0 +1,9 @@
+# For documentation on how to configure this file,
+# see https://diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+file = "src/schema.rs"
+custom_type_derives = ["diesel::query_builder::QueryId"]
+
+[migrations_directory]
+dir = "migrations"

migrations/00000000000000_diesel_initial_setup/down.sql

@@ -0,0 +1,6 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
+DROP FUNCTION IF EXISTS diesel_set_updated_at();

migrations/00000000000000_diesel_initial_setup/up.sql

@@ -0,0 +1,36 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+
+
+
+-- Sets up a trigger for the given table to automatically set a column called
+-- `updated_at` whenever the row is modified (unless `updated_at` was included
+-- in the modified columns)
+--
+-- # Example
+--
+-- ```sql
+-- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
+--
+-- SELECT diesel_manage_updated_at('users');
+-- ```
+CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
+BEGIN
+    EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
+                    FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
+BEGIN
+    IF (
+        NEW IS DISTINCT FROM OLD AND
+        NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
+    ) THEN
+        NEW.updated_at := current_timestamp;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;

migrations/2024-02-11-020849_create_users/down.sql

@@ -0,0 +1 @@
+DROP TABLE users;

migrations/2024-02-11-020849_create_users/up.sql

@@ -0,0 +1,8 @@
+CREATE TABLE users (
+  id SERIAL PRIMARY KEY,
+  username VARCHAR NOT NULL,
+  real_name VARCHAR NOT NULL,
+  email VARCHAR NOT NULL,
+  password_hash VARCHAR NOT NULL,
+  password_salt VARCHAR NOT NULL
+);

src/main.rs

@@ -1,13 +1,27 @@
-use std::env;
+use {
-use askama::Template;
+    askama::Template,
-use axum::{routing::get, Router};
+    axum::{extract::State, routing::get, Router},
-use tower_http::services::ServeDir;
+    deadpool_diesel::postgres::{Manager, Pool, Runtime},
+    std::env,
+    tower_http::services::ServeDir,
+};
+
+mod models;
+mod schema;
+
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let db_pool_manager = Manager::new(env::var("LOCALHUB_DATABASE_URL")?, Runtime::Tokio1);
+    let db_pool = Pool::builder(db_pool_manager).max_size(8).build()?;
+
     let app = Router::new()
         .route("/", get(root))
-        .nest_service("/static", ServeDir::new(env::var("STATIC_FILE_PATH")?));
+        .with_state(db_pool)
+        .nest_service(
+            "/static",
+            ServeDir::new(env::var("LOCALHUB_STATIC_FILE_PATH")?),
+        );
 
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await?;
     axum::serve(listener, app).await?;
@@ -20,6 +34,13 @@ struct IndexTemplate<'a> {
     title: &'a str,
 }
 
-async fn root<'a>() -> IndexTemplate<'a> {
+async fn root<'a>(State(db_pool): State<Pool>) -> IndexTemplate<'a> {
+    use self::models::*;
+    use diesel::prelude::*;
+    let db_conn = db_pool.get().await.unwrap();
+    db_conn.interact(|conn| {
+        let results = schema::users::table.select(User::as_select()).load(conn).unwrap();
+        println!("Found {} users", results.len());
+    }).await.unwrap();
     IndexTemplate { title: "LocalHub" }
 }

src/models.rs

@@ -0,0 +1,13 @@
+use diesel::prelude::*;
+
+#[derive(Queryable, Selectable)]
+#[diesel(table_name = crate::schema::users)]
+#[diesel(check_for_backend(diesel::pg::Pg))]
+pub struct User {
+    pub id: i32,
+    pub username: String,
+    pub real_name: String,
+    pub email: String,
+    pub password_hash: String,
+    pub password_salt: String,
+}

src/schema.rs

@@ -0,0 +1,12 @@
+// @generated automatically by Diesel CLI.
+
+diesel::table! {
+    users (id) {
+        id -> Int4,
+        username -> Varchar,
+        real_name -> Varchar,
+        email -> Varchar,
+        password_hash -> Varchar,
+        password_salt -> Varchar,
+    }
+}