SQL_URL -> DATABASE_URL

hotate29 · Nov 15, 2022 · c5ca4f5 · c5ca4f5
1 parent 6826963
commit c5ca4f5
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 18 deletions.
diff --git a/atcoder-problems-backend/README.md b/atcoder-problems-backend/README.md
@@ -45,7 +45,7 @@ docker-compose exec backend-development cargo build
 ## Run
 
 ```bash
-export SQL_URL=... # Connection URL of PostgreSQL
+export DATABASE_URL=... # Connection URL of PostgreSQL
 export CLIENT_ID=... # GitHub client_id, which is required to use the login function.
 export CLIENT_SECRET=... # GitHub client_secret, which is required to use the login function.
 

diff --git a/atcoder-problems-backend/scripts/sql-backup.sh b/atcoder-problems-backend/scripts/sql-backup.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-psql ${SQL_URL} -c "\copy submissions TO './submissions.csv' WITH (FORMAT CSV, HEADER)"
+psql ${DATABASE_URL} -c "\copy submissions TO './submissions.csv' WITH (FORMAT CSV, HEADER)"
 gzip submissions.csv
 aws s3 cp submissions.csv.gz s3://kenkoooo/submissions.csv.gz --acl public-read
diff --git a/atcoder-problems-backend/src/bin/batch_update.rs b/atcoder-problems-backend/src/bin/batch_update.rs
@@ -18,7 +18,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     info!("Started!");
 
     info!("Connecting to SQL ...");
-    let url = env::var("SQL_URL")?;
+    let url = env::var("DATABASE_URL")?;
     let conn = initialize_pool(&url).await?;
 
     info!("Loading submissions ...");

diff --git a/atcoder-problems-backend/src/bin/crawl_all_submissions.rs b/atcoder-problems-backend/src/bin/crawl_all_submissions.rs
@@ -13,7 +13,7 @@ use std::{env, time::Duration};
 async fn main() {
     init_log_config().unwrap();
     info!("Started");
-    let url = env::var("SQL_URL").expect("SQL_URL is not set.");
+    let url = env::var("DATABASE_URL").expect("DATABASE_URL is not set.");
 
     loop {
         info!("Start new loop");

diff --git a/atcoder-problems-backend/src/bin/crawl_for_virtual_contests.rs b/atcoder-problems-backend/src/bin/crawl_for_virtual_contests.rs
@@ -32,7 +32,7 @@ async fn crawl<R: Rng>(url: &str, rng: &mut R) -> Result<()> {
 #[actix_web::main]
 async fn main() {
     init_log_config().unwrap();
-    let url = env::var("SQL_URL").expect("SQL_URL must be set.");
+    let url = env::var("DATABASE_URL").expect("DATABASE_URL must be set.");
     log::info!("Started");
 
     let mut rng = thread_rng();

diff --git a/atcoder-problems-backend/src/bin/crawl_from_new_contests.rs b/atcoder-problems-backend/src/bin/crawl_from_new_contests.rs
@@ -28,7 +28,7 @@ async fn iteration(url: &str) -> Result<()> {
 async fn main() {
     init_log_config().unwrap();
     info!("Started");
-    let url = env::var("SQL_URL").expect("SQL_URL is not set.");
+    let url = env::var("DATABASE_URL").expect("DATABASE_URL is not set.");
 
     loop {
         info!("Start new loop");

diff --git a/atcoder-problems-backend/src/bin/crawl_problems.rs b/atcoder-problems-backend/src/bin/crawl_problems.rs
@@ -8,7 +8,7 @@ use std::env;
 async fn main() {
     init_log_config().unwrap();
     log::info!("Started");
-    let url = env::var("SQL_URL").expect("SQL_URL is not set.");
+    let url = env::var("DATABASE_URL").expect("DATABASE_URL is not set.");
 
     let db = initialize_pool(&url).await.unwrap();
     let crawler = ProblemCrawler::new(db, AtCoderClient::default());

diff --git a/atcoder-problems-backend/src/bin/crawl_recent_submissions.rs b/atcoder-problems-backend/src/bin/crawl_recent_submissions.rs
@@ -16,7 +16,7 @@ async fn crawl(url: &str) -> Result<()> {
 async fn main() {
     init_log_config().unwrap();
     log::info!("Started");
-    let url = env::var("SQL_URL").expect("SQL_URL must be set.");
+    let url = env::var("DATABASE_URL").expect("DATABASE_URL must be set.");
 
     loop {
         log::info!("Start new loop");

diff --git a/atcoder-problems-backend/src/bin/crawl_whole_contest.rs b/atcoder-problems-backend/src/bin/crawl_whole_contest.rs
@@ -10,7 +10,7 @@ use std::env;
 async fn main() -> Result<()> {
     init_log_config()?;
     info!("Started");
-    let url = env::var("SQL_URL").expect("SQL_URL should be set as environmental variable.");
+    let url = env::var("DATABASE_URL").expect("DATABASE_URL should be set as environmental variable.");
     let contest_id = env::args()
         .nth(1)
         .expect("contest_id is not set.\nUsage: cargo run --bin crawl_whole_contest <contest_id>");

diff --git a/atcoder-problems-backend/src/bin/delta_update.rs b/atcoder-problems-backend/src/bin/delta_update.rs
@@ -16,7 +16,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     info!("Started!");
 
     info!("Connecting to SQL ...");
-    let url = env::var("SQL_URL")?;
+    let url = env::var("DATABASE_URL")?;
     let conn = initialize_pool(&url).await?;
 
     info!("Loading submissions ...");

diff --git a/atcoder-problems-backend/src/bin/dump_json.rs b/atcoder-problems-backend/src/bin/dump_json.rs
@@ -20,7 +20,7 @@ const LANGUAGE_COUNT_LIMIT: usize = 1000;
 async fn main() -> Result<()> {
     init_log_config()?;
     log::info!("Started!");
-    let url = env::var("SQL_URL")?;
+    let url = env::var("DATABASE_URL")?;
     let pg_pool = initialize_pool(&url).await?;
 
     let client = s3::S3Client::new()?;

diff --git a/atcoder-problems-backend/src/bin/fix_invalid_submissions.rs b/atcoder-problems-backend/src/bin/fix_invalid_submissions.rs
@@ -12,7 +12,7 @@ const ONE_DAY: i64 = 24 * 3600;
 async fn main() {
     init_log_config().unwrap();
     info!("Started");
-    let url = env::var("SQL_URL").expect("SQL_URL must be set.");
+    let url = env::var("DATABASE_URL").expect("DATABASE_URL must be set.");
     let db = initialize_pool(&url).await.unwrap();
     let now = Utc::now().timestamp();
     let crawler = FixCrawler::new(db, AtCoderClient::default(), now - ONE_DAY);

diff --git a/atcoder-problems-backend/src/bin/run_server.rs b/atcoder-problems-backend/src/bin/run_server.rs
@@ -7,7 +7,7 @@ use atcoder_problems_backend::utils::init_log_config;
 #[actix_web::main]
 async fn main() {
     init_log_config().unwrap();
-    let database_url = env::var("SQL_URL").expect("SQL_URL is not set.");
+    let database_url = env::var("DATABASE_URL").expect("DATABASE_URL is not set.");
     let port = 8080;
 
     let client_id = env::var("CLIENT_ID").unwrap_or_else(|_| String::new());

diff --git a/atcoder-problems-backend/tests/utils.rs b/atcoder-problems-backend/tests/utils.rs
@@ -5,14 +5,14 @@ use sql_client::{initialize_pool, PgPool};
 use std::fs::read_to_string;
 
 const SQL_FILE: &str = "../config/database-definition.sql";
-const SQL_URL_ENV_KEY: &str = "SQL_URL";
+const DATABASE_URL_ENV_KEY: &str = "DATABASE_URL";
 
-pub fn get_sql_url_from_env() -> String {
-    std::env::var(SQL_URL_ENV_KEY).unwrap()
+pub fn get_database_url_from_env() -> String {
+    std::env::var(DATABASE_URL_ENV_KEY).unwrap()
 }
 
 pub async fn initialize_and_connect_to_test_sql() -> PgPool {
-    let conn = initialize_pool(get_sql_url_from_env()).await.unwrap();
+    let conn = initialize_pool(get_database_url_from_env()).await.unwrap();
     initialize(&conn).await;
     conn
 }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,6 @@ services:
   backend-development:
     image: rust:1.63.0
     environment:
-      SQL_URL: postgres://db_user:db_pass@postgresql:5432/test_db
       DATABASE_URL: postgres://db_user:db_pass@postgresql:5432/test_db
       RUST_LOG: info
     ports: