From fc78f15ebf7e575e03404126360f3e193e4085e9 Mon Sep 17 00:00:00 2001
From: Felix Wiedemann <felix@kann.it>
Date: Tue, 14 Apr 2020 20:51:04 +0200
Subject: [PATCH] postgres:  Add support for non-default socket paths

---
 sqlx-core/src/postgres/stream.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/sqlx-core/src/postgres/stream.rs b/sqlx-core/src/postgres/stream.rs
index 52ca2079..3cf2a0bb 100644
--- a/sqlx-core/src/postgres/stream.rs
+++ b/sqlx-core/src/postgres/stream.rs
@@ -26,9 +26,20 @@ impl PgStream {
         let host = url.host();
         let port = url.port(5432);
         #[cfg(unix)]
-        let stream = match host {
-            Some(host) => MaybeTlsStream::connect(host, port).await?,
-            None => MaybeTlsStream::connect_uds(format!("/var/run/postgresql/.s.PGSQL.{}", port)).await?,
+        let stream = {
+            let host = host
+                .map(|host| {
+                    percent_encoding::percent_decode_str(host)
+                        .decode_utf8()
+                        .expect("percent-encoded hostname contained non-UTF-8 bytes")
+                })
+                .unwrap_or("/var/run/postgresql".into());
+            if host.starts_with("/") {
+                let path = format!("{}/.s.PGSQL.{}", host, port);
+                MaybeTlsStream::connect_uds(&path).await?
+            } else {
+                MaybeTlsStream::connect(&host, port).await?
+            }
         };
         #[cfg(not(unix))]
         let stream = MaybeTlsStream::connect(host.unwrap_or("localhost"), port).await?;