theseus-rs
diff --git a/‎postgresql_embedded/src/postgresql.rs
Copy file name to clipboardExpand all lines: postgresql_embedded/src/postgresql.rs
+13-8Lines changed: 13 additions & 8 deletions b/‎postgresql_embedded/src/postgresql.rs
Copy file name to clipboardExpand all lines: postgresql_embedded/src/postgresql.rs
+13-8Lines changed: 13 additions & 8 deletions
diff --git a/‎postgresql_embedded/src/settings.rs
Copy file name to clipboardExpand all lines: postgresql_embedded/src/settings.rs
+3Lines changed: 3 additions & 0 deletions b/‎postgresql_embedded/src/settings.rs
Copy file name to clipboardExpand all lines: postgresql_embedded/src/settings.rs
+3Lines changed: 3 additions & 0 deletions
@@ -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()
 
@@ -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,
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ pub struct Settings {`
`58`	`58`	`pub timeout: Option<Duration>,`
`59`	`59`	`/// Server configuration options`
`60`	`60`	`pub configuration: HashMap<String, String>,`
	`61`	`+ /// Skip installation and inferrence of the installation dir. Trust what the user provided.`
	`62`	`+ pub trust_installation_dir: bool,`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`/// Settings implementation`
`@@ -109,6 +111,7 @@ impl Settings {`
`109`	`111`	`temporary: true,`
`110`	`112`	`timeout: Some(Duration::from_secs(5)),`
`111`	`113`	`configuration: HashMap::new(),`
	`114`	`+ trust_installation_dir: false,`
`112`	`115`	`}`
`113`	`116`	`}`
`114`	`117`