vw_small

commit b37f0dfde3209e654e73cf75f11e166ef5eaa648
parent b34d548246f6cb13e8e5392f66718205980053d7
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Sun,  5 Jul 2020 01:07:29 +0200

Merge pull request #1044 from ArmaanT/master

Allow postgres:// in DATABASE_URL
Diffstat:
M
src/config.rs
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git 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")
     }