WIP: makes ConnectionOptions::ssl_mod OS agnostic

On Windows `ConnectionOptions::ssl_mod` will be set to `None`

Author: p-alik

diesel/src/mysql/connection/raw.rs

@@ -48,7 +48,6 @@ impl RawConnection {
         let unix_socket = connection_options.unix_socket();
         let client_flags = connection_options.client_flags();
 
-        #[cfg(not(windows))]
         // allow single_match because compiler complains about if after cfg
         // error: attributes are not yet allowed on `if` expressions
         #[allow(clippy::single_match)]
@@ -190,7 +189,6 @@ impl RawConnection {
         self.did_an_error_occur()
     }
 
-    #[cfg(not(windows))]
     fn set_ssl_mode(&self, ssl_mode: mysqlclient_sys::mysql_ssl_mode) {
         let v = ssl_mode as u32;
         let v_ptr: *const u32 = &v;

diesel/src/mysql/connection/url.rs

@@ -49,7 +49,6 @@ pub struct ConnectionOptions {
     port: Option<u16>,
     unix_socket: Option<CString>,
     client_flags: CapabilityFlags,
-    #[cfg(not(windows))]
     ssl_mode: Option<mysql_ssl_mode>,
 }
 
@@ -78,23 +77,26 @@ impl ConnectionOptions {
             _ => None,
         };
 
-        #[cfg(not(windows))]
-        let ssl_mode = match query_pairs.get("ssl_mode") {
-            Some(v) => {
-                let ssl_mode = match v.to_lowercase().as_str() {
-                    "disabled" => mysql_ssl_mode::SSL_MODE_DISABLED,
-                    "preferred" => mysql_ssl_mode::SSL_MODE_PREFERRED,
-                    "required" => mysql_ssl_mode::SSL_MODE_REQUIRED,
-                    "verify_ca" => mysql_ssl_mode::SSL_MODE_VERIFY_CA,
-                    "verify_identity" => mysql_ssl_mode::SSL_MODE_VERIFY_IDENTITY,
-                    _ => {
-                        let msg = "unknown ssl_mode";
-                        return Err(ConnectionError::InvalidConnectionUrl(msg.into()));
-                    }
-                };
-                Some(ssl_mode)
+        let ssl_mode = if cfg!(target_os = "windows") {
+            None
+        } else {
+            match query_pairs.get("ssl_mode") {
+                Some(v) => {
+                    let ssl_mode = match v.to_lowercase().as_str() {
+                        "disabled" => mysql_ssl_mode::SSL_MODE_DISABLED,
+                        "preferred" => mysql_ssl_mode::SSL_MODE_PREFERRED,
+                        "required" => mysql_ssl_mode::SSL_MODE_REQUIRED,
+                        "verify_ca" => mysql_ssl_mode::SSL_MODE_VERIFY_CA,
+                        "verify_identity" => mysql_ssl_mode::SSL_MODE_VERIFY_IDENTITY,
+                        _ => {
+                            let msg = "unknown ssl_mode";
+                            return Err(ConnectionError::InvalidConnectionUrl(msg.into()));
+                        }
+                    };
+                    Some(ssl_mode)
+                }
+                _ => None,
             }
-            _ => None,
         };
 
         let host = match url.host() {
@@ -125,7 +127,6 @@ impl ConnectionOptions {
             port: url.port(),
             unix_socket: unix_socket,
             client_flags: client_flags,
-            #[cfg(not(windows))]
             ssl_mode: ssl_mode,
         })
     }
@@ -158,7 +159,6 @@ impl ConnectionOptions {
         self.client_flags
     }
 
-    #[cfg(not(windows))]
     pub fn ssl_mode(&self) -> Option<mysql_ssl_mode> {
         self.ssl_mode
     }
@@ -298,29 +298,32 @@ fn unix_socket_tests() {
     );
 }
 
-#[cfg(not(windows))]
 #[test]
 fn ssl_mode() {
     let ssl_mode = |url| ConnectionOptions::parse(url).unwrap().ssl_mode();
-    assert_eq!(ssl_mode("mysql://localhost"), None);
-    assert_eq!(
-        ssl_mode("mysql://localhost?ssl_mode=disabled"),
-        Some(mysql_ssl_mode::SSL_MODE_DISABLED)
-    );
-    assert_eq!(
-        ssl_mode("mysql://localhost?ssl_mode=PREFERRED"),
-        Some(mysql_ssl_mode::SSL_MODE_PREFERRED)
-    );
-    assert_eq!(
-        ssl_mode("mysql://localhost?ssl_mode=required"),
-        Some(mysql_ssl_mode::SSL_MODE_REQUIRED)
-    );
-    assert_eq!(
-        ssl_mode("mysql://localhost?ssl_mode=VERIFY_CA"),
-        Some(mysql_ssl_mode::SSL_MODE_VERIFY_CA)
-    );
-    assert_eq!(
-        ssl_mode("mysql://localhost?ssl_mode=verify_identity"),
-        Some(mysql_ssl_mode::SSL_MODE_VERIFY_IDENTITY)
-    );
+    if cfg!(target_os = "windows") {
+        assert_eq!(ssl_mode("mysql://localhost?ssl_mode=required"), None);
+    } else {
+        assert_eq!(ssl_mode("mysql://localhost"), None);
+        assert_eq!(
+            ssl_mode("mysql://localhost?ssl_mode=disabled"),
+            Some(mysql_ssl_mode::SSL_MODE_DISABLED)
+        );
+        assert_eq!(
+            ssl_mode("mysql://localhost?ssl_mode=PREFERRED"),
+            Some(mysql_ssl_mode::SSL_MODE_PREFERRED)
+        );
+        assert_eq!(
+            ssl_mode("mysql://localhost?ssl_mode=required"),
+            Some(mysql_ssl_mode::SSL_MODE_REQUIRED)
+        );
+        assert_eq!(
+            ssl_mode("mysql://localhost?ssl_mode=VERIFY_CA"),
+            Some(mysql_ssl_mode::SSL_MODE_VERIFY_CA)
+        );
+        assert_eq!(
+            ssl_mode("mysql://localhost?ssl_mode=verify_identity"),
+            Some(mysql_ssl_mode::SSL_MODE_VERIFY_IDENTITY)
+        );
+    }
 }