fix: always use the build version of postgresql when the bundled feature is enabled to avoid network access

Author: brianheineman

postgresql_embedded/src/postgresql.rs

@@ -1,9 +1,11 @@
 use crate::error::Error::{DatabaseInitializationError, DatabaseStartError, DatabaseStopError};
 use crate::error::Result;
 use crate::settings::{BOOTSTRAP_DATABASE, BOOTSTRAP_SUPERUSER, Settings};
+use postgresql_archive::extract;
+#[cfg(not(feature = "bundled"))]
+use postgresql_archive::get_archive;
 use postgresql_archive::get_version;
 use postgresql_archive::{ExactVersion, ExactVersionReq};
-use postgresql_archive::{extract, get_archive};
 #[cfg(feature = "tokio")]
 use postgresql_commands::AsyncCommandExecutor;
 use postgresql_commands::CommandBuilder;
@@ -179,6 +181,11 @@ impl PostgreSQL {
     /// returned.
     #[instrument(skip(self))]
     async fn install(&mut self) -> Result<()> {
+        #[cfg(feature = "bundled")]
+        {
+            self.settings.version = crate::settings::ARCHIVE_VERSION.clone();
+        }
+
         debug!(
             "Starting installation process for version {}",
             self.settings.version
@@ -201,28 +208,21 @@ impl PostgreSQL {
 
         let url = &self.settings.releases_url;
 
+        // When the `bundled` feature is enabled, use the bundled archive instead of downloading it
+        // from the internet.
         #[cfg(feature = "bundled")]
-        // If the requested version is the same as the version of the bundled archive, use the bundled
-        // archive. This avoids downloading the archive in environments where internet access is
-        // restricted or undesirable.
-        let (version, bytes) = if *crate::settings::ARCHIVE_VERSION == self.settings.version {
+        let bytes = {
             debug!("Using bundled installation archive");
-            (
-                self.settings.version.clone(),
-                crate::settings::ARCHIVE.to_vec(),
-            )
-        } else {
-            let (version, bytes) = get_archive(url, &self.settings.version).await?;
-            (version.exact_version_req()?, bytes)
+            crate::settings::ARCHIVE.to_vec()
         };
 
         #[cfg(not(feature = "bundled"))]
-        let (version, bytes) = {
+        let bytes = {
             let (version, bytes) = get_archive(url, &self.settings.version).await?;
-            (version.exact_version_req()?, bytes)
+            self.settings.version = version.exact_version_req()?;
+            bytes
         };
 
-        self.settings.version = version;
         extract(url, &bytes, &self.settings.installation_dir).await?;
 
         debug!(

postgresql_embedded/src/settings.rs

@@ -1,5 +1,7 @@
 use crate::error::{Error, Result};
 use postgresql_archive::VersionReq;
+#[cfg(feature = "bundled")]
+use postgresql_archive::{ExactVersionReq, Version};
 use rand::Rng;
 use rand::distr::Alphanumeric;
 use std::collections::HashMap;
@@ -8,8 +10,6 @@ use std::env::{current_dir, home_dir};
 use std::ffi::OsString;
 use std::path::PathBuf;
 #[cfg(feature = "bundled")]
-use std::str::FromStr;
-#[cfg(feature = "bundled")]
 use std::sync::LazyLock;
 use std::time::Duration;
 use url::Url;
@@ -18,7 +18,8 @@ use url::Url;
 #[expect(clippy::unwrap_used)]
 pub(crate) static ARCHIVE_VERSION: LazyLock<VersionReq> = LazyLock::new(|| {
     let version_string = include_str!(concat!(std::env!("OUT_DIR"), "/postgresql.version"));
-    let version_req = VersionReq::from_str(&format!("={version_string}")).unwrap();
+    let version = Version::parse(version_string).unwrap();
+    let version_req = version.exact_version_req().unwrap();
     tracing::debug!("Bundled installation archive version {version_string}");
     version_req
 });

postgresql_embedded/tests/blocking.rs

@@ -7,7 +7,7 @@ use test_log::test;
 
 #[cfg(feature = "blocking")]
 #[test]
-fn test_lifecycle() -> Result<()> {
+fn test_embedded_blocking_lifecycle() -> Result<()> {
     let mut postgresql = PostgreSQL::default();
     let settings = postgresql.settings();
 

postgresql_embedded/tests/postgresql.rs

@@ -34,7 +34,7 @@ async fn lifecycle() -> Result<()> {
 }
 
 #[test(tokio::test)]
-async fn test_lifecycle() -> Result<()> {
+async fn test_embedded_async_lifecycle() -> Result<()> {
     lifecycle().await
 }
 

postgresql_extensions/tests/blocking.rs

@@ -22,7 +22,7 @@ fn test_get_available_extensions() -> anyhow::Result<()> {
 
 #[cfg(all(target_os = "linux", feature = "blocking", feature = "tensor-chord"))]
 #[test]
-fn test_lifecycle() -> anyhow::Result<()> {
+fn test_extensions_blocking_lifecycle() -> anyhow::Result<()> {
     let installation_dir = tempfile::tempdir()?.path().to_path_buf();
     let settings = postgresql_embedded::Settings {
         version: postgresql_embedded::VersionReq::parse("=16.4.0")?,

postgresql_extensions/tests/extensions.rs

@@ -21,10 +21,11 @@ async fn test_get_available_extensions() -> Result<()> {
 
 #[cfg(all(target_os = "linux", feature = "tensor-chord"))]
 #[tokio::test]
-async fn test_lifecycle() -> Result<()> {
+async fn test_extensions_tensor_chord_lifecycle() -> Result<()> {
     let installation_dir = tempfile::tempdir()?.path().to_path_buf();
+    let postgresql_version = semver::VersionReq::parse("=16.4.0")?;
     let settings = postgresql_embedded::Settings {
-        version: postgresql_embedded::VersionReq::parse("=16.4.0")?,
+        version: postgresql_version.clone(),
         installation_dir: installation_dir.clone(),
         ..Default::default()
     };
@@ -33,6 +34,12 @@ async fn test_lifecycle() -> Result<()> {
     postgresql.setup().await?;
 
     let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        return Ok(());
+    }
+
     let namespace = "tensor-chord";
     let name = "pgvecto.rs";
     let version = semver::VersionReq::parse("=0.3.0")?;

postgresql_extensions/tests/portal_corp.rs

@@ -4,11 +4,11 @@
 )))]
 #[cfg(feature = "portal-corp")]
 #[tokio::test]
-async fn test_lifecycle() -> anyhow::Result<()> {
+async fn test_extensions_portal_corp_lifecycle() -> anyhow::Result<()> {
     let installation_dir = tempfile::tempdir()?.path().to_path_buf();
     let postgresql_version = semver::VersionReq::parse("=16.4.0")?;
     let settings = postgresql_embedded::Settings {
-        version: postgresql_version,
+        version: postgresql_version.clone(),
         installation_dir: installation_dir.clone(),
         ..Default::default()
     };
@@ -17,6 +17,12 @@ async fn test_lifecycle() -> anyhow::Result<()> {
     postgresql.setup().await?;
 
     let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        return Ok(());
+    }
+
     let namespace = "portal-corp";
     let name = "pgvector_compiled";
     let version = semver::VersionReq::parse("=0.16.12")?;

postgresql_extensions/tests/steampipe.rs

@@ -1,11 +1,11 @@
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 #[cfg(feature = "steampipe")]
 #[tokio::test]
-async fn test_lifecycle() -> anyhow::Result<()> {
+async fn test_extensions_steampipe_lifecycle() -> anyhow::Result<()> {
     let installation_dir = tempfile::tempdir()?.path().to_path_buf();
     let postgresql_version = semver::VersionReq::parse("=15.7.0")?;
     let settings = postgresql_embedded::Settings {
-        version: postgresql_version,
+        version: postgresql_version.clone(),
         installation_dir: installation_dir.clone(),
         ..Default::default()
     };
@@ -14,6 +14,12 @@ async fn test_lifecycle() -> anyhow::Result<()> {
     postgresql.setup().await?;
 
     let settings = postgresql.settings();
+    // Skip the test if the PostgreSQL version does not match; when testing with the 'bundled'
+    // feature, the version may vary and the test will fail.
+    if settings.version != postgresql_version {
+        return Ok(());
+    }
+
     let namespace = "steampipe";
     let name = "csv";
     let version = semver::VersionReq::parse("=0.12.0")?;