From 1652419d9433af858b2491c1d0193d4bdd1e6502 Mon Sep 17 00:00:00 2001
From: Imbus <imbus64@protonmail.com>
Date: Tue, 28 Nov 2023 00:36:11 +0100
Subject: [PATCH] Moved migrations_pg -> migrations and updated relevant
 references

---
 justfile                                                     | 4 ++--
 server/{migrations_pg => migrations}/0001_users_table.sql    | 0
 server/{migrations_pg => migrations}/0002_posts_table.sql    | 0
 server/{migrations_pg => migrations}/0003_comments_table.sql | 0
 server/src/state.rs                                          | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename server/{migrations_pg => migrations}/0001_users_table.sql (100%)
 rename server/{migrations_pg => migrations}/0002_posts_table.sql (100%)
 rename server/{migrations_pg => migrations}/0003_comments_table.sql (100%)

diff --git a/justfile b/justfile
index 20a3fa9..0b6f273 100644
--- a/justfile
+++ b/justfile
@@ -39,7 +39,7 @@ start-release: start-postgres-dev clean-podman init-sqlx build-container-release
 init-sqlx:
     echo {{env_local}} > server/.env
     cd server && sqlx database create --connect-timeout 40 # Postgres takes a while to start up
-    cd server && sqlx migrate run --source migrations_pg
+    cd server && sqlx migrate run
     cd server && cargo sqlx prepare
 
 # Starts a postgres container for development
@@ -72,4 +72,4 @@ clean: clean-podman clean-images
     rm -rf client-solid/node_modules
     rm -rf server/public
     rm -rf server/target
-    @echo "Cleaned up! Make sure to clean up podman volumes and networks."
\ No newline at end of file
+    @echo "Cleaned up! Make sure to clean up podman volumes and networks."
diff --git a/server/migrations_pg/0001_users_table.sql b/server/migrations/0001_users_table.sql
similarity index 100%
rename from server/migrations_pg/0001_users_table.sql
rename to server/migrations/0001_users_table.sql
diff --git a/server/migrations_pg/0002_posts_table.sql b/server/migrations/0002_posts_table.sql
similarity index 100%
rename from server/migrations_pg/0002_posts_table.sql
rename to server/migrations/0002_posts_table.sql
diff --git a/server/migrations_pg/0003_comments_table.sql b/server/migrations/0003_comments_table.sql
similarity index 100%
rename from server/migrations_pg/0003_comments_table.sql
rename to server/migrations/0003_comments_table.sql
diff --git a/server/src/state.rs b/server/src/state.rs
index aafca2b..ae75e23 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -43,7 +43,7 @@ impl ServerState {
             .await
             .unwrap();
 
-        sqlx::migrate!("./migrations_pg").run(&pool).await.unwrap();
+        sqlx::migrate!("./migrations").run(&pool).await.unwrap();
 
         match crate::db::db_new_user("imbus".to_string(), "kartellen1234".to_string(), &pool).await
         {