update

Author: cchexcode

docs/README.md

@@ -39,15 +39,25 @@ cargo install --path .
 `qop` is configured using a `qop.toml` file. Here is an example for PostgreSQL:
 
 ```toml
-[backend]
-type = "postgres"
-host = "localhost"
-port = 5432
-username = "postgres"
-password = "password"
-database = "postgres"
+[backend.postgres]
+connection = { static = "postgresql://postgres:password@localhost:5432/postgres" }
 schema = "public"
 table = "migrations"
+
+[backend.postgres.migrations]
+timeout = 30
+```
+
+You can also use environment variables for the connection string:
+
+```toml
+[backend.postgres]
+connection = { from_env = "DATABASE_URL" }
+schema = "public"
+table = "migrations"
+
+[backend.postgres.migrations]
+timeout = 30
 ```
 
 The migration files are expected to be in a directory relative to the `qop.toml` file.
@@ -139,23 +149,27 @@ qop migration list --path path/to/your/qop.toml
 **Arguments:**
 *   `-p, --path <PATH>`: Path to the `qop.toml` configuration file. (default: `qop.toml`)
 
-#### `qop migration sync`
+#### `qop migration history`
+
+Manages migration history with commands for syncing and fixing migration order.
+
+##### `qop migration history sync`
 
 Upserts all remote migrations locally. This is useful for syncing migrations across multiple developers.
 
 ```bash
-qop migration sync --path path/to/your/qop.toml
+qop migration history sync --path path/to/your/qop.toml
 ```
 
 **Arguments:**
 *   `-p, --path <PATH>`: Path to the `qop.toml` configuration file. (default: `qop.toml`)
 
-#### `qop migration fix`
+##### `qop migration history fix`
 
 Shuffles all non-run local migrations to the end of the chain. This is useful when you have created migrations out of order.
 
 ```bash
-qop migration fix --path path/to/your/qop.toml
+qop migration history fix --path path/to/your/qop.toml
 ```
 
 **Arguments:**

example/id=1753311846662/up.sql

@@ -1,13 +1 @@
-ALTER TABLE "ASD" ADD COLUMN "ASD" TEXT FOREIGN KEY REFERENCES "X"("Y");
-DROP TABLE "boosker";-- This is a header comment
-ALTER TABLE "users" ADD COLUMN "email" TEXT; -- inline comment
-
-/* 
-Multi-line comment
-*/
-DROP TABLE "old_table";
-
-CREATE TABLE "new_table" (
-    id SERIAL PRIMARY KEY, -- column comment
-    name VARCHAR(255) /* another inline comment */
-);
+-- SQL goes here

example/qop.toml

@@ -1,8 +1,7 @@
 [backend.postgres]
 table = "__qop"
 schema = "public"
-host = "localhost"
-port = 5432
-database = "postgres"
-username = "postgres"
-password = "postgres"
+[backend.postgres.connection]
+from_env = "QOP_BACKEND_POSTGRES_CONNECTION"
+[backend.postgres.migrations]
+timeout = 60

src/args.rs

@@ -53,6 +53,13 @@ pub(crate) enum MigrationApply {
     },
 }
 
+#[derive(Debug)]
+pub(crate) enum HistoryCommand {
+    Sync,
+    Fix,
+}
+
+
 #[derive(Debug)]
 pub(crate) enum MigrationCommand {
     Init,
@@ -70,8 +77,7 @@ pub(crate) enum MigrationCommand {
     },
     Apply(MigrationApply),
     List,
-    Sync,
-    Fix,
+    History(HistoryCommand),
     Diff,
 }
 
@@ -183,12 +189,17 @@ impl ClapArgumentLoader {
                             .about("Lists all applied migrations."),
                     )
                     .subcommand(
-                        clap::Command::new("sync")
-                            .about("Upserts all remote migrations locally."),
-                    )
-                    .subcommand(
-                        clap::Command::new("fix")
-                            .about("Shuffles all non-run local migrations to the end of the chain."),
+                        clap::Command::new("history")
+                            .about("Manages migration history.")
+                            .subcommand_required(true)
+                            .subcommand(
+                                clap::Command::new("sync")
+                                    .about("Upserts all remote migrations locally."),
+                            )
+                            .subcommand(
+                                clap::Command::new("fix")
+                                    .about("Shuffles all non-run local migrations to the end of the chain."),
+                            ),
                     )
                     .subcommand(
                         clap::Command::new("diff")
@@ -263,10 +274,15 @@ impl ClapArgumentLoader {
                 }
             } else if let Some(_) = subc.subcommand_matches("list") {
                 MigrationCommand::List
-            } else if let Some(_) = subc.subcommand_matches("sync") {
-                MigrationCommand::Sync
-            } else if let Some(_) = subc.subcommand_matches("fix") {
-                MigrationCommand::Fix
+            } else if let Some(history_subc) = subc.subcommand_matches("history") {
+                let history_cmd = if let Some(_) = history_subc.subcommand_matches("sync") {
+                    HistoryCommand::Sync
+                } else if let Some(_) = history_subc.subcommand_matches("fix") {
+                    HistoryCommand::Fix
+                } else {
+                    unreachable!();
+                };
+                MigrationCommand::History(history_cmd)
             } else if let Some(_) = subc.subcommand_matches("diff") {
                 MigrationCommand::Diff
             } else if let Some(apply_subc) = subc.subcommand_matches("apply") {

src/config.rs

@@ -1,29 +1,32 @@
 use serde::{Deserialize, Serialize};
+use serde::de::DeserializeOwned;
 
 #[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub struct Config {
     pub backend: Backend,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub struct PostgresMigrations {
     pub timeout: Option<u64>,
 }
 
+
 #[derive(Debug, Serialize, Deserialize)]
-pub struct PostgresConnection {
-    pub host: String,
-    pub port: u16,
-    pub username: Option<String>,
-    pub password: Option<String>,
-    pub database: String,
+#[serde(rename_all = "snake_case")]
+#[serde(bound(serialize = "T: Serialize", deserialize = "T: DeserializeOwned"))]
+pub enum DataSource<T: Serialize + DeserializeOwned> {
+    Static(T),
+    FromEnv(String),
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum Backend {
     Postgres {
-        connection: PostgresConnection,
+        connection: DataSource<String>,
         migrations: PostgresMigrations,
         schema: String,
         table: String,