Merge pull request #31 from theseus-rs/disable-default-bundled-feature

fix!: remove bundled as a default feature and corrected bug when the bundled feature is not used

Author: brianheineman

Cargo.lock

@@ -33,7 +33,7 @@ test-log = { workspace = true }
 tokio = { workspace = true }
 
 [features]
-default = ["bundled"]
+default = []
 blocking = ["tokio"]
 bundled = []
 tokio = ["dep:tokio"]

postgresql_embedded/Cargo.toml

@@ -71,14 +71,14 @@ At runtime, the PostgreSQL binaries are cached by default in the following direc
 
 ## Feature flags
 
-postgresql_embedded uses [feature flags] to address compile time and binary size
+postgresql_embedded uses feature flags to address compile time and binary size
 uses.
 
 The following features are available:
 
 | Name       | Description                                               | Default? |
 |------------|-----------------------------------------------------------|----------|
-| `bundled`  | Bundles the PostgreSQL archive into the resulting binary  | Yes      |
+| `bundled`  | Bundles the PostgreSQL archive into the resulting binary  | No       |
 | `blocking` | Enables the blocking API; requires `tokio`                | No       |
 | `tokio`    | Enables using tokio for async                             | No       |
 

postgresql_embedded/README.md

@@ -76,14 +76,14 @@
 //!
 //! ## Feature flags
 //!
-//! postgresql_embedded uses [feature flags] to address compile time and binary size
+//! postgresql_embedded uses feature flags to address compile time and binary size
 //! uses.
 //!
 //! The following features are available:
 //!
 //! | Name       | Description                                               | Default? |
 //! |------------|-----------------------------------------------------------|----------|
-//! | `bundled`  | Bundles the PostgreSQL archive into the resulting binary  | Yes      |
+//! | `bundled`  | Bundles the PostgreSQL archive into the resulting binary  | No      |
 //! | `blocking` | Enables the blocking API; requires `tokio`                | No       |
 //! | `tokio`    | Enables using tokio for async                             | No       |
 //!

postgresql_embedded/src/lib.rs

@@ -6,7 +6,6 @@ use crate::command::traits::{CommandBuilder, CommandExecutor};
 use crate::error::Error::{DatabaseInitializationError, DatabaseStartError, DatabaseStopError};
 use crate::error::Result;
 use crate::settings::Settings;
-use bytes::Bytes;
 use postgresql_archive::{extract, get_archive};
 use postgresql_archive::{get_version, Version};
 use std::fs::{create_dir_all, remove_dir_all, remove_file};
@@ -79,9 +78,13 @@ impl PostgreSQL {
 
     /// Get the default version used if not otherwise specified
     pub fn default_version() -> Version {
-        if cfg!(feature = "bundled") {
+        #[cfg(feature = "bundled")]
+        {
             *ARCHIVE_VERSION
-        } else {
+        }
+
+        #[cfg(not(feature = "bundled"))]
+        {
             postgresql_archive::LATEST
         }
     }
@@ -176,7 +179,7 @@ impl PostgreSQL {
         // restricted or undesirable.
         let (version, bytes) = if ARCHIVE_VERSION.deref() == &self.version {
             debug!("Using bundled installation archive");
-            (self.version, Bytes::copy_from_slice(ARCHIVE))
+            (self.version, bytes::Bytes::copy_from_slice(ARCHIVE))
         } else {
             get_archive(&self.version).await?
         };
@@ -445,8 +448,6 @@ impl Drop for PostgreSQL {
 
 #[cfg(test)]
 mod tests {
-    use test_log::test;
-
     #[test]
     #[cfg(feature = "bundled")]
     fn test_archive_version() {