diff --git a/migrations/20210310122154_mcaptcha_users.sql b/migrations/20210310122154_mcaptcha_users.sql deleted file mode 100644 index 79e230aa..00000000 --- a/migrations/20210310122154_mcaptcha_users.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TABLE IF NOT EXISTS mcaptcha_users ( - name VARCHAR(100) NOT NULL UNIQUE, - email VARCHAR(100) UNIQUE DEFAULT NULL, - email_verified BOOLEAN DEFAULT NULL, - secret varchar(50) NOT NULL UNIQUE, - password TEXT NOT NULL, - ID SERIAL PRIMARY KEY NOT NULL -); diff --git a/migrations/20210310122617_mcaptcha_config.sql b/migrations/20210310122617_mcaptcha_config.sql deleted file mode 100644 index ba2dc9d6..00000000 --- a/migrations/20210310122617_mcaptcha_config.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE IF NOT EXISTS mcaptcha_config ( - config_id SERIAL PRIMARY KEY NOT NULL, - user_id INTEGER NOT NULL references mcaptcha_users(ID) ON DELETE CASCADE, - key varchar(100) NOT NULL UNIQUE, - name varchar(100) NOT NULL, - duration integer NOT NULL DEFAULT 30 -); diff --git a/migrations/20210310122902_mcaptcha_levels.sql b/migrations/20210310122902_mcaptcha_levels.sql deleted file mode 100644 index e04963ac..00000000 --- a/migrations/20210310122902_mcaptcha_levels.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE IF NOT EXISTS mcaptcha_levels ( - config_id INTEGER references mcaptcha_config(config_id) ON DELETE CASCADE, - difficulty_factor INTEGER NOT NULL, - visitor_threshold INTEGER NOT NULL, - level_id SERIAL PRIMARY KEY NOT NULL -); diff --git a/migrations/20210430032935_mcaptcha_pow_fetched_stats.sql b/migrations/20210430032935_mcaptcha_pow_fetched_stats.sql deleted file mode 100644 index 0a770f42..00000000 --- a/migrations/20210430032935_mcaptcha_pow_fetched_stats.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE TABLE IF NOT EXISTS mcaptcha_pow_fetched_stats ( - config_id INTEGER references mcaptcha_config(config_id) ON DELETE CASCADE, - time timestamptz NOT NULL DEFAULT now() -); diff --git a/migrations/20210509135118_mcaptcha_pow_solved_stats.sql b/migrations/20210509135118_mcaptcha_pow_solved_stats.sql deleted file mode 100644 index 1f9d7214..00000000 --- a/migrations/20210509135118_mcaptcha_pow_solved_stats.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE TABLE IF NOT EXISTS mcaptcha_pow_solved_stats ( - config_id INTEGER references mcaptcha_config(config_id) ON DELETE CASCADE, - time timestamptz NOT NULL DEFAULT now() -); diff --git a/migrations/20210509135154_mcaptcha_pow_confirmed_stats.sql b/migrations/20210509135154_mcaptcha_pow_confirmed_stats.sql deleted file mode 100644 index 348c7008..00000000 --- a/migrations/20210509135154_mcaptcha_pow_confirmed_stats.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE TABLE IF NOT EXISTS mcaptcha_pow_confirmed_stats ( - config_id INTEGER references mcaptcha_config(config_id) ON DELETE CASCADE, - time timestamptz NOT NULL DEFAULT now() -); diff --git a/migrations/20210509151150_mcaptcha_notifications.sql b/migrations/20210509151150_mcaptcha_notifications.sql deleted file mode 100644 index 56e5e733..00000000 --- a/migrations/20210509151150_mcaptcha_notifications.sql +++ /dev/null @@ -1,10 +0,0 @@ --- Add migration script here -CREATE TABLE IF NOT EXISTS mcaptcha_notifications ( - id SERIAL PRIMARY KEY NOT NULL, - tx INTEGER NOT NULL references mcaptcha_users(ID) ON DELETE CASCADE, - rx INTEGER NOT NULL references mcaptcha_users(ID) ON DELETE CASCADE, - heading varchar(30) NOT NULL, - message varchar(250) NOT NULL, - read BOOLEAN DEFAULT NULL, - received timestamptz NOT NULL DEFAULT now() -); diff --git a/migrations/20211202141927_mcaptcha_sitekey_user_provided_avg_traffic.sql b/migrations/20211202141927_mcaptcha_sitekey_user_provided_avg_traffic.sql deleted file mode 100644 index 0c8697e2..00000000 --- a/migrations/20211202141927_mcaptcha_sitekey_user_provided_avg_traffic.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE IF NOT EXISTS mcaptcha_sitekey_user_provided_avg_traffic ( - config_id INTEGER PRIMARY KEY UNIQUE NOT NULL references mcaptcha_config(config_id) ON DELETE CASCADE, - avg_traffic INTEGER DEFAULT NULL, - peak_sustainable_traffic INTEGER DEFAULT NULL, - broke_my_site_traffic INTEGER DEFAULT NULL -); diff --git a/migrations/20211218133703_change_user_provided_avg_traffic_col_datatype.sql b/migrations/20211218133703_change_user_provided_avg_traffic_col_datatype.sql deleted file mode 100644 index 4d2aa195..00000000 --- a/migrations/20211218133703_change_user_provided_avg_traffic_col_datatype.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE mcaptcha_sitekey_user_provided_avg_traffic - ALTER COLUMN avg_traffic SET NOT NULL, - ALTER COLUMN peak_sustainable_traffic SET NOT NULL; diff --git a/src/data.rs b/src/data.rs index 3b155be4..260c775b 100644 --- a/src/data.rs +++ b/src/data.rs @@ -192,12 +192,13 @@ impl Data { pool_options, url: settings.database.url.clone(), }); - let dblib = Box::new(connection_options.connect().await.unwrap()); + let dblib = connection_options.connect().await.unwrap(); + dblib.migrate().await.unwrap(); let data = Data { creds, db, - dblib, + dblib: Box::new(dblib), captcha: SystemGroup::new().await, mailer: Self::get_mailer(), }; diff --git a/src/main.rs b/src/main.rs index f22ed37e..390a9069 100644 --- a/src/main.rs +++ b/src/main.rs @@ -111,7 +111,6 @@ async fn main() -> std::io::Result<()> { ); let data = Data::new().await; - sqlx::migrate!("./migrations/").run(&data.db).await.unwrap(); let data = actix_web::web::Data::new(data); let mut demo_user: Option = None;