migrations everywhere!

examples/users/migrations/1733765331409957000_rwf_auth_users.down.sql

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

examples/users/migrations/1733765331409957000_rwf_auth_users.up.sql

@@ -0,0 +1,8 @@
+CREATE TABLE rwf_auth_users (
+    id BIGSERIAL PRIMARY KEY,
+    identifier VARCHAR NOT NULL UNIQUE,
+    password VARCHAR NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW ()
+);
+
+CREATE INDEX ON rwf_auth_users USING btree (created_at);

examples/users/migrations/1733778837089567000_rwf_init.down.sql

@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS rwf_requests;
+
+DROP TABLE IF EXISTS rwf_jobs;

examples/users/migrations/1733778837089567000_rwf_init.up.sql

@@ -0,0 +1,45 @@
+
+CREATE TABLE IF NOT EXISTS rwf_jobs (
+    id BIGSERIAL PRIMARY KEY,
+    name VARCHAR NOT NULL,
+    args JSONB NOT NULL DEFAULT '{}'::jsonb,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    start_after TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    started_at TIMESTAMPTZ,
+    attempts INT NOT NULL DEFAULT 0,
+    retries BIGINT NOT NULL DEFAULT 25,
+    completed_at TIMESTAMPTZ,
+    error VARCHAR
+);
+
+-- Pending jobs
+CREATE INDEX IF NOT EXISTS rwf_jobs_pending_idx ON rwf_jobs USING btree(start_after, created_at) WHERE
+    completed_at IS NULL
+    AND started_at IS NULL
+    AND attempts < retries;
+
+-- Running jobs
+CREATE INDEX IF NOT EXISTS rwf_jobs_runnin_idx ON rwf_jobs USING btree(start_after, created_at) WHERE
+    completed_at IS NULL
+    AND started_at IS NOT NULL
+    AND attempts < retries;
+
+CREATE INDEX IF NOT EXISTS rwf_jobs_name_completed_at_idx ON rwf_jobs USING btree(name, completed_at);
+
+CREATE TABLE IF NOT EXISTS rwf_requests (
+    id BIGSERIAL PRIMARY KEY,
+    path VARCHAR NOT NULL,
+    method VARCHAR NOT NULL DEFAULT 'GET',
+    query JSONB NOT NULL DEFAULT '{}'::jsonb,
+    code INTEGER NOT NULL DEFAULT 200,
+    client_ip INET,
+    client_id UUID NOT NULL DEFAULT gen_random_uuid(),
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    duration REAL NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS rwf_requests_path_created_at ON rwf_requests USING btree(created_at, path, client_id);
+
+CREATE INDEX IF NOT EXISTS rwf_requests_errors ON rwf_requests USING btree(created_at, code, client_id) WHERE code >= 400;
+
+CREATE INDEX IF NOT EXISTS rwf_requests_too_slow ON rwf_requests USING btree(created_at, duration, client_id) WHERE duration >= 1000.0; -- the unit is milliseconds

examples/users/rwf.toml

@@ -1,6 +1,6 @@
 [general]
 secret_key = "9Sk2t2G40QC3QrdVr6e6RzYAKJLGTFjpDiRrmA7eGQk="
-log_queries = true
+# log_queries = true
 
 [database]
 name = "rwf_users"

rwf-auth/src/lib.rs

@@ -10,3 +10,7 @@ pub async fn migrate() -> Result<Migrations, Error> {
     let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     rwf::model::migrate(Some(path)).await
 }
+
+pub fn migrations_path() -> PathBuf {
+    PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("migrations")
+}

rwf-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rwf-cli"
-version = "0.1.14"
+version = "0.2.2"
 edition = "2021"
 license = "MIT"
 description = "Rust Web Framework CLI"

rwf-cli/src/migrate.rs

@@ -2,6 +2,7 @@ use rwf::model::migrations::{Direction, Migrations};
 use std::path::Path;
 use time::OffsetDateTime;
 
+use log::info;
 use regex::Regex;
 use tokio::fs::{create_dir, File};
 
@@ -10,10 +11,16 @@ use crate::{logging::created, util::package_info};
 pub async fn migrate(version: Option<i64>) {
     let info = package_info().await.expect("couldn't get package info");
 
+    info!("Installing migrations from rwf");
+    Migrations::install(rwf::migrations_path())
+        .await
+        .expect("install rwf migrations failed");
+
     if info.rwf_auth {
-        rwf_auth::migrate()
+        info!("Installing migrations from rwf-auth");
+        Migrations::install(rwf_auth::migrations_path())
             .await
-            .expect("rwf-auth migrations failed to apply");
+            .expect("install rwf-auth migrations failed");
     }
 
     let migrations = Migrations::sync(None)

rwf/Cargo.toml

@@ -10,6 +10,7 @@ homepage = "https://levkk.github.io/rwf/"
 repository = "https://github.com/levkk/rwf"
 keywords = ["mvc", "web", "framework", "http", "orm"]
 authors = ["Lev Kokotov <[email protected]>"]
+include = ["src/", "migrations/"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

rwf/migrations/1733778837089567000_rwf_init.down.sql

@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS rwf_requests;
+
+DROP TABLE IF EXISTS rwf_jobs;

rwf/migrations/1733778837089567000_rwf_init.up.sql

@@ -0,0 +1,45 @@
+
+CREATE TABLE IF NOT EXISTS rwf_jobs (
+    id BIGSERIAL PRIMARY KEY,
+    name VARCHAR NOT NULL,
+    args JSONB NOT NULL DEFAULT '{}'::jsonb,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    start_after TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    started_at TIMESTAMPTZ,
+    attempts INT NOT NULL DEFAULT 0,
+    retries BIGINT NOT NULL DEFAULT 25,
+    completed_at TIMESTAMPTZ,
+    error VARCHAR
+);
+
+-- Pending jobs
+CREATE INDEX IF NOT EXISTS rwf_jobs_pending_idx ON rwf_jobs USING btree(start_after, created_at) WHERE
+    completed_at IS NULL
+    AND started_at IS NULL
+    AND attempts < retries;
+
+-- Running jobs
+CREATE INDEX IF NOT EXISTS rwf_jobs_runnin_idx ON rwf_jobs USING btree(start_after, created_at) WHERE
+    completed_at IS NULL
+    AND started_at IS NOT NULL
+    AND attempts < retries;
+
+CREATE INDEX IF NOT EXISTS rwf_jobs_name_completed_at_idx ON rwf_jobs USING btree(name, completed_at);
+
+CREATE TABLE IF NOT EXISTS rwf_requests (
+    id BIGSERIAL PRIMARY KEY,
+    path VARCHAR NOT NULL,
+    method VARCHAR NOT NULL DEFAULT 'GET',
+    query JSONB NOT NULL DEFAULT '{}'::jsonb,
+    code INTEGER NOT NULL DEFAULT 200,
+    client_ip INET,
+    client_id UUID NOT NULL DEFAULT gen_random_uuid(),
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    duration REAL NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS rwf_requests_path_created_at ON rwf_requests USING btree(created_at, path, client_id);
+
+CREATE INDEX IF NOT EXISTS rwf_requests_errors ON rwf_requests USING btree(created_at, code, client_id) WHERE code >= 400;
+
+CREATE INDEX IF NOT EXISTS rwf_requests_too_slow ON rwf_requests USING btree(created_at, duration, client_id) WHERE duration >= 1000.0; -- the unit is milliseconds

rwf/src/lib.rs

@@ -108,7 +108,7 @@ pub use tokio;
 /// Asynchronous PostgreSQL driver.
 pub use tokio_postgres;
 
-use std::net::SocketAddr;
+use std::{net::SocketAddr, path::PathBuf};
 
 /// Convert text to snake_case.
 pub fn snake_case(string: &str) -> String {
@@ -176,3 +176,8 @@ pub fn peer_addr(addr: &str) -> Option<SocketAddr> {
 
     None
 }
+
+/// Migrations path for rwf.
+pub fn migrations_path() -> PathBuf {
+    PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("migrations")
+}

rwf/src/model/migrations/bootstrap.sql

@@ -1,53 +1,9 @@
-SET LOCAL client_min_messages TO WARNING;
+SET
+    LOCAL client_min_messages TO WARNING;
 
 CREATE TABLE IF NOT EXISTS rwf_migrations (
-	id BIGSERIAL PRIMARY KEY,
-	version BIGINT NOT NULL,
-	name VARCHAR UNIQUE NOT NULL,
-	applied_at TIMESTAMPTZ
-);
-
-CREATE TABLE IF NOT EXISTS rwf_jobs (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
-    args JSONB NOT NULL DEFAULT '{}'::jsonb,
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    start_after TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    started_at TIMESTAMPTZ,
-    attempts INT NOT NULL DEFAULT 0,
-    retries BIGINT NOT NULL DEFAULT 25,
-    completed_at TIMESTAMPTZ,
-    error VARCHAR
+    version BIGINT NOT NULL,
+    name VARCHAR UNIQUE NOT NULL,
+    applied_at TIMESTAMPTZ
 );
-
--- Pending jobs
-CREATE INDEX IF NOT EXISTS rwf_jobs_pending_idx ON rwf_jobs USING btree(start_after, created_at) WHERE
-    completed_at IS NULL
-    AND started_at IS NULL
-    AND attempts < retries;
-
--- Running jobs
-CREATE INDEX IF NOT EXISTS rwf_jobs_runnin_idx ON rwf_jobs USING btree(start_after, created_at) WHERE
-    completed_at IS NULL
-    AND started_at IS NOT NULL
-    AND attempts < retries;
-
-CREATE INDEX IF NOT EXISTS rwf_jobs_name_completed_at_idx ON rwf_jobs USING btree(name, completed_at);
-
-CREATE TABLE IF NOT EXISTS rwf_requests (
-    id BIGSERIAL PRIMARY KEY,
-    path VARCHAR NOT NULL,
-    method VARCHAR NOT NULL DEFAULT 'GET',
-    query JSONB NOT NULL DEFAULT '{}'::jsonb,
-    code INTEGER NOT NULL DEFAULT 200,
-    client_ip INET,
-    client_id UUID NOT NULL DEFAULT gen_random_uuid(),
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    duration REAL NOT NULL
-);
-
-CREATE INDEX IF NOT EXISTS rwf_requests_path_created_at ON rwf_requests USING btree(created_at, path, client_id);
-
-CREATE INDEX IF NOT EXISTS rwf_requests_errors ON rwf_requests USING btree(created_at, code, client_id) WHERE code >= 400;
-
-CREATE INDEX IF NOT EXISTS rwf_requests_too_slow ON rwf_requests USING btree(created_at, duration, client_id) WHERE duration >= 1000.0; -- the unit is milliseconds

rwf/src/model/migrations/mod.rs

@@ -13,7 +13,7 @@ use std::path::{Path, PathBuf};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use time::OffsetDateTime;
-use tokio::fs::{read_dir, read_to_string};
+use tokio::fs::{copy, read_dir, read_to_string};
 use tracing::{error, info};
 
 /// Migrations found in the `"migrations"` folder. Some of them
@@ -100,7 +100,8 @@ impl MigrationFile {
 }
 
 impl Migrations {
-    fn root_path(path: Option<PathBuf>) -> Result<PathBuf, Error> {
+    /// Get the migrations folder.
+    pub fn root_path(path: Option<PathBuf>) -> Result<PathBuf, Error> {
         let path = PathBuf::from(
             if let Some(path) = path {
                 path
@@ -120,6 +121,19 @@ impl Migrations {
         }
     }
 
+    /// Install migrations from specified path.
+    pub async fn install(from_path: PathBuf) -> Result<(), Error> {
+        let migrations_path = Self::root_path(None)?;
+        let mut entries = read_dir(from_path).await?;
+        while let Some(entry) = entries.next_entry().await? {
+            let src = entry.path();
+            let dest = migrations_path.join(entry.path().file_name().unwrap());
+            copy(src, dest).await.expect("copy");
+        }
+
+        Ok(())
+    }
+
     async fn load(root_path: Option<PathBuf>) -> Result<Self, Error> {
         let mut conn = get_connection().await?;
         let migrations = Migration::all().fetch_all(&mut conn).await?;