Merge pull request #195 from nataliejameson/nmj/skip-installation

Allow skipping the installation step during setup

Author: brianheineman

postgresql_embedded/src/postgresql.rs

@@ -55,16 +55,17 @@ impl PostgreSQL {
         // conflicts with other versions.  This will also facilitate setting the status of the
         // server to the correct initial value.  If the minor and release version are not set, the
         // installation directory will be determined dynamically during the installation process.
-        if let Some(version) = postgresql.settings.version.exact_version() {
-            let path = &postgresql.settings.installation_dir;
-            let version_string = version.to_string();
-
-            if !path.ends_with(&version_string) {
-                postgresql.settings.installation_dir =
-                    postgresql.settings.installation_dir.join(version_string);
+        if !postgresql.settings.trust_installation_dir {
+            if let Some(version) = postgresql.settings.version.exact_version() {
+                let path = &postgresql.settings.installation_dir;
+                let version_string = version.to_string();
+
+                if !path.ends_with(&version_string) {
+                    postgresql.settings.installation_dir =
+                        postgresql.settings.installation_dir.join(version_string);
+                }
             }
         }
-
         postgresql
     }
 
@@ -93,6 +94,10 @@ impl PostgreSQL {
     /// If it doesn't, it will search all the child directories for the latest version that matches the requirement.
     /// If it returns None, we couldn't find a matching installation.
     fn installed_dir(&self) -> Option<PathBuf> {
+        if self.settings.trust_installation_dir {
+            return Some(self.settings.installation_dir.clone());
+        }
+
         let path = &self.settings.installation_dir;
         let maybe_path_version = path
             .file_name()

postgresql_embedded/src/settings.rs

@@ -58,6 +58,8 @@ pub struct Settings {
     pub timeout: Option<Duration>,
     /// Server configuration options
     pub configuration: HashMap<String, String>,
+    /// Skip installation and inferrence of the installation dir. Trust what the user provided.
+    pub trust_installation_dir: bool,
 }
 
 /// Settings implementation
@@ -109,6 +111,7 @@ impl Settings {
             temporary: true,
             timeout: Some(Duration::from_secs(5)),
             configuration: HashMap::new(),
+            trust_installation_dir: false,
         }
     }
 
@@ -190,6 +193,9 @@ impl Settings {
                 }
             };
         }
+        if let Some(trust_installation_dir) = query_parameters.get("trust_installation_dir") {
+            settings.trust_installation_dir = trust_installation_dir == "true";
+        }
         let configuration_prefix = "configuration.";
         for (key, value) in &query_parameters {
             if key.starts_with(configuration_prefix) {
@@ -296,10 +302,11 @@ mod tests {
         let password_file = "password_file=/tmp/.pgpass";
         let data_dir = "data_dir=/tmp/data";
         let temporary = "temporary=false";
+        let trust_installation_dir = "trust_installation_dir=true";
         let timeout = "timeout=10";
         let configuration = "configuration.max_connections=42";
         let url = format!(
-            "{base_url}?{releases_url}&{version}&{installation_dir}&{password_file}&{data_dir}&{temporary}&{temporary}&{timeout}&{configuration}"
+            "{base_url}?{releases_url}&{version}&{installation_dir}&{password_file}&{data_dir}&{temporary}&{trust_installation_dir}&{timeout}&{configuration}"
         );
 
         let settings = Settings::from_url(url)?;
@@ -314,6 +321,7 @@ mod tests {
         assert_eq!(BOOTSTRAP_SUPERUSER, settings.username);
         assert_eq!("password", settings.password);
         assert!(!settings.temporary);
+        assert!(settings.trust_installation_dir);
         assert_eq!(Some(Duration::from_secs(10)), settings.timeout);
         let configuration = HashMap::from([("max_connections".to_string(), "42".to_string())]);
         assert_eq!(configuration, settings.configuration);