Merge branch 'main' into update-dependencies

Author: brianheineman

postgresql_archive/src/archive.rs

@@ -45,7 +45,7 @@ pub async fn extract(url: &str, bytes: &Vec<u8>, out_dir: &Path) -> Result<Vec<P
     let extractor_fn = extractor::registry::get(url)?;
     let mut extract_directories = extractor::ExtractDirectories::default();
     extract_directories.add_mapping(Regex::new(".*")?, out_dir.to_path_buf());
-    extractor_fn(bytes, extract_directories)
+    extractor_fn(bytes, &extract_directories)
 }
 
 #[cfg(test)]

postgresql_archive/src/configuration/theseus/extractor.rs

@@ -13,7 +13,7 @@ use tracing::{debug, instrument, warn};
 /// # Errors
 /// Returns an error if the extraction fails.
 #[instrument(skip(bytes))]
-pub fn extract(bytes: &Vec<u8>, extract_directories: ExtractDirectories) -> Result<Vec<PathBuf>> {
+pub fn extract(bytes: &Vec<u8>, extract_directories: &ExtractDirectories) -> Result<Vec<PathBuf>> {
     let out_dir = extract_directories.get_path(".")?;
 
     let parent_dir = if let Some(parent) = out_dir.parent() {
@@ -41,7 +41,7 @@ pub fn extract(bytes: &Vec<u8>, extract_directories: ExtractDirectories) -> Resu
     debug!("Extracting archive to {}", extract_dir.to_string_lossy());
     let mut archive_extract_directories = ExtractDirectories::default();
     archive_extract_directories.add_mapping(Regex::new(".*")?, extract_dir.clone());
-    let files = tar_gz_extract(bytes, archive_extract_directories)?;
+    let files = tar_gz_extract(bytes, &archive_extract_directories)?;
 
     if out_dir.exists() {
         debug!(

postgresql_archive/src/configuration/zonky/extractor.rs

@@ -16,7 +16,7 @@ use zip::ZipArchive;
 /// Returns an error if the extraction fails.
 #[expect(clippy::case_sensitive_file_extension_comparisons)]
 #[instrument(skip(bytes))]
-pub fn extract(bytes: &Vec<u8>, extract_directories: ExtractDirectories) -> Result<Vec<PathBuf>> {
+pub fn extract(bytes: &Vec<u8>, extract_directories: &ExtractDirectories) -> Result<Vec<PathBuf>> {
     let out_dir = extract_directories.get_path(".")?;
     let parent_dir = if let Some(parent) = out_dir.parent() {
         parent
@@ -63,7 +63,7 @@ pub fn extract(bytes: &Vec<u8>, extract_directories: ExtractDirectories) -> Resu
 
     let mut archive_extract_directories = ExtractDirectories::default();
     archive_extract_directories.add_mapping(Regex::new(".*")?, extract_dir.clone());
-    let files = tar_xz_extract(&archive_bytes, archive_extract_directories)?;
+    let files = tar_xz_extract(&archive_bytes, &archive_extract_directories)?;
 
     if out_dir.exists() {
         debug!(

postgresql_archive/src/extractor/registry.rs

@@ -12,7 +12,7 @@ static REGISTRY: LazyLock<Arc<Mutex<RepositoryRegistry>>> =
     LazyLock::new(|| Arc::new(Mutex::new(RepositoryRegistry::default())));
 
 type SupportsFn = fn(&str) -> Result<bool>;
-type ExtractFn = fn(&Vec<u8>, ExtractDirectories) -> Result<Vec<PathBuf>>;
+type ExtractFn = fn(&Vec<u8>, &ExtractDirectories) -> Result<Vec<PathBuf>>;
 
 /// Singleton struct to store extractors
 #[expect(clippy::type_complexity)]
@@ -107,7 +107,7 @@ mod tests {
         let extractor = get(url)?;
         let mut extract_directories = ExtractDirectories::default();
         extract_directories.add_mapping(Regex::new(".*")?, PathBuf::from("test"));
-        assert!(extractor(&Vec::new(), extract_directories).is_ok());
+        assert!(extractor(&Vec::new(), &extract_directories).is_ok());
         Ok(())
     }
 

postgresql_archive/src/extractor/tar_gz_extractor.rs

@@ -14,7 +14,7 @@ use tracing::{debug, instrument, warn};
 /// # Errors
 /// Returns an error if the extraction fails.
 #[instrument(skip(bytes))]
-pub fn extract(bytes: &Vec<u8>, extract_directories: ExtractDirectories) -> Result<Vec<PathBuf>> {
+pub fn extract(bytes: &Vec<u8>, extract_directories: &ExtractDirectories) -> Result<Vec<PathBuf>> {
     let mut files = Vec::new();
     let input = BufReader::new(Cursor::new(bytes));
     let decoder = GzDecoder::new(input);

postgresql_archive/src/extractor/tar_xz_extractor.rs

@@ -14,7 +14,7 @@ use tracing::{debug, instrument, warn};
 /// # Errors
 /// Returns an error if the extraction fails.
 #[instrument(skip(bytes))]
-pub fn extract(bytes: &Vec<u8>, extract_directories: ExtractDirectories) -> Result<Vec<PathBuf>> {
+pub fn extract(bytes: &Vec<u8>, extract_directories: &ExtractDirectories) -> Result<Vec<PathBuf>> {
     let mut files = Vec::new();
     let input = BufReader::new(Cursor::new(bytes));
     let decoder = XzDecoder::new(input);

postgresql_archive/src/extractor/zip_extractor.rs

@@ -13,7 +13,7 @@ use zip::ZipArchive;
 /// # Errors
 /// Returns an error if the extraction fails.
 #[instrument(skip(bytes))]
-pub fn extract(bytes: &Vec<u8>, extract_directories: ExtractDirectories) -> Result<Vec<PathBuf>> {
+pub fn extract(bytes: &Vec<u8>, extract_directories: &ExtractDirectories) -> Result<Vec<PathBuf>> {
     let mut files = Vec::new();
     let reader = Cursor::new(bytes);
     let mut archive = ZipArchive::new(reader).map_err(|_| io::Error::other("Zip error"))?;

postgresql_embedded/src/postgresql.rs

@@ -145,6 +145,10 @@ impl PostgreSQL {
     /// Set up the database by extracting the archive and initializing the database.
     /// If the installation directory already exists, the archive will not be extracted.
     /// If the data directory already exists, the database will not be initialized.
+    ///
+    /// # Errors
+    ///
+    /// If the installation fails, an error will be returned.
     #[instrument(skip(self))]
     pub async fn setup(&mut self) -> Result<()> {
         match self.installed_dir() {
@@ -259,6 +263,10 @@ impl PostgreSQL {
 
     /// Start the database and wait for the startup to complete.
     /// If the port is set to `0`, the database will be started on a random port.
+    ///
+    /// # Errors
+    ///
+    /// If the database fails to start, an error will be returned.
     #[instrument(skip(self))]
     pub async fn start(&mut self) -> Result<()> {
         if self.settings.port == 0 {
@@ -299,6 +307,10 @@ impl PostgreSQL {
     }
 
     /// Stop the database gracefully (smart mode) and wait for the shutdown to complete.
+    ///
+    /// # Errors
+    ///
+    /// If the database fails to stop, an error will be returned.
     #[instrument(skip(self))]
     pub async fn stop(&self) -> Result<()> {
         debug!(
@@ -333,6 +345,10 @@ impl PostgreSQL {
     }
 
     /// Create a new database with the given name.
+    ///
+    /// # Errors
+    ///
+    /// If the database creation fails, an error will be returned.
     #[instrument(skip(self))]
     pub async fn create_database<S>(&self, database_name: S) -> Result<()>
     where
@@ -359,6 +375,10 @@ impl PostgreSQL {
     }
 
     /// Check if a database with the given name exists.
+    ///
+    /// # Errors
+    ///
+    /// If the query fails, an error will be returned.
     #[instrument(skip(self))]
     pub async fn database_exists<S>(&self, database_name: S) -> Result<bool>
     where
@@ -383,6 +403,10 @@ impl PostgreSQL {
     }
 
     /// Drop a database with the given name.
+    ///
+    /// # Errors
+    ///
+    /// If the database does not exist or if the drop command fails, an error will be returned.
     #[instrument(skip(self))]
     pub async fn drop_database<S>(&self, database_name: S) -> Result<()>
     where

postgresql_extensions/src/repository/portal_corp/repository.rs

@@ -80,7 +80,7 @@ impl Repository for PortalCorp {
         extract_directories.add_mapping(Regex::new(r"\.(dll|dylib|so)$")?, library_dir);
         extract_directories.add_mapping(Regex::new(r"\.(control|sql)$")?, extension_dir);
         let bytes = &archive.to_vec();
-        let files = zip_extract(bytes, extract_directories)?;
+        let files = zip_extract(bytes, &extract_directories)?;
         Ok(files)
     }
 }

postgresql_extensions/src/repository/steampipe/repository.rs

@@ -93,7 +93,7 @@ impl Repository for Steampipe {
         extract_directories.add_mapping(Regex::new(r"\.(dll|dylib|so)$")?, library_dir);
         extract_directories.add_mapping(Regex::new(r"\.(control|sql)$")?, extension_dir);
         let bytes = &archive.to_vec();
-        let files = tar_gz_extract(bytes, extract_directories)?;
+        let files = tar_gz_extract(bytes, &extract_directories)?;
         Ok(files)
     }
 }