From 624791e09a41b6b1489db731256a7d73a880133d Mon Sep 17 00:00:00 2001 From: Armaan Tobaccowalla Date: Sat, 4 Jul 2020 16:13:27 -0400 Subject: [PATCH] Allow postgres:// DATABASE_URL --- src/config.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/config.rs b/src/config.rs index e5b46d37..80c2d80f 100644 --- a/src/config.rs +++ b/src/config.rs @@ -412,7 +412,9 @@ make_config! { fn validate_config(cfg: &ConfigItems) -> Result<(), Error> { let db_url = cfg.database_url.to_lowercase(); - if cfg!(feature = "sqlite") && (db_url.starts_with("mysql:") || db_url.starts_with("postgresql:")) { + if cfg!(feature = "sqlite") + && (db_url.starts_with("mysql:") || db_url.starts_with("postgresql:") || db_url.starts_with("postgres:")) + { err!("`DATABASE_URL` is meant for MySQL or Postgres, while this server is meant for SQLite") } @@ -420,7 +422,7 @@ fn validate_config(cfg: &ConfigItems) -> Result<(), Error> { err!("`DATABASE_URL` should start with mysql: when using the MySQL server") } - if cfg!(feature = "postgresql") && !db_url.starts_with("postgresql:") { + if cfg!(feature = "postgresql") && !(db_url.starts_with("postgresql:") || db_url.starts_with("postgres:")) { err!("`DATABASE_URL` should start with postgresql: when using the PostgreSQL server") }