Merge pull request #57 from theseus-rs/bootstrap-superuser

fix!: define bootstrap superuser as postgres

Author: brianheineman

Cargo.lock

@@ -1,6 +1,6 @@
 use crate::error::Error::{DatabaseInitializationError, DatabaseStartError, DatabaseStopError};
 use crate::error::Result;
-use crate::settings::Settings;
+use crate::settings::{Settings, BOOTSTRAP_SUPERUSER};
 use postgresql_archive::{extract, get_archive};
 use postgresql_archive::{get_version, Version};
 use postgresql_commands::initdb::InitDbBuilder;
@@ -222,6 +222,7 @@ impl PostgreSQL {
 
         let initdb = InitDbBuilder::from(&self.settings)
             .pgdata(&self.settings.data_dir)
+            .username(BOOTSTRAP_SUPERUSER)
             .auth("password")
             .pwfile(&self.settings.password_file)
             .encoding("UTF8");
@@ -310,9 +311,8 @@ impl PostgreSQL {
         );
         let psql = PsqlBuilder::from(&self.settings)
             .command(format!("CREATE DATABASE \"{}\"", database_name.as_ref()))
-            .no_psqlrc()
-            .no_align()
-            .tuples_only();
+            .username(BOOTSTRAP_SUPERUSER)
+            .no_psqlrc();
 
         match self.execute_command(psql).await {
             Ok((_stdout, _stderr)) => {
@@ -337,18 +337,14 @@ impl PostgreSQL {
             self.settings.host,
             self.settings.port
         );
-        let psql = PsqlBuilder::new()
+        let psql = PsqlBuilder::from(&self.settings)
             .program_dir(self.settings.binary_dir())
             .command(format!(
                 "SELECT 1 FROM pg_database WHERE datname='{}'",
                 database_name.as_ref()
             ))
-            .host(&self.settings.host)
-            .port(self.settings.port)
-            .username(&self.settings.username)
-            .pg_password(&self.settings.password)
+            .username(BOOTSTRAP_SUPERUSER)
             .no_psqlrc()
-            .no_align()
             .tuples_only();
 
         match self.execute_command(psql).await {
@@ -369,19 +365,14 @@ impl PostgreSQL {
             self.settings.host,
             self.settings.port
         );
-        let psql = PsqlBuilder::new()
+        let psql = PsqlBuilder::from(&self.settings)
             .program_dir(self.settings.binary_dir())
             .command(format!(
                 "DROP DATABASE IF EXISTS \"{}\"",
                 database_name.as_ref()
             ))
-            .host(&self.settings.host)
-            .port(self.settings.port)
-            .username(&self.settings.username)
-            .pg_password(&self.settings.password)
-            .no_psqlrc()
-            .no_align()
-            .tuples_only();
+            .username(BOOTSTRAP_SUPERUSER)
+            .no_psqlrc();
 
         match self.execute_command(psql).await {
             Ok((_stdout, _stderr)) => {

postgresql_embedded/src/postgresql.rs

@@ -11,6 +11,9 @@ use std::str::FromStr;
 use std::time::Duration;
 use url::Url;
 
+/// PostgreSQL's superuser
+pub const BOOTSTRAP_SUPERUSER: &str = "postgres";
+
 /// Database settings
 #[derive(Clone, Debug, PartialEq, PartialOrd)]
 pub struct Settings {
@@ -72,7 +75,7 @@ impl Settings {
             data_dir,
             host: "localhost".to_string(),
             port: 0,
-            username: "postgres".to_string(),
+            username: BOOTSTRAP_SUPERUSER.to_string(),
             password,
             temporary: true,
             timeout: Some(Duration::from_secs(5)),
@@ -203,7 +206,7 @@ mod tests {
         assert!(settings.password_file.ends_with(".pgpass"));
         assert!(!settings.data_dir.to_str().unwrap_or_default().is_empty());
         assert_eq!(0, settings.port);
-        assert_eq!("postgres", settings.username);
+        assert_eq!(BOOTSTRAP_SUPERUSER, settings.username);
         assert!(!settings.password.is_empty());
         assert_ne!("password", settings.password);
         assert!(settings.binary_dir().ends_with("bin"));
@@ -229,7 +232,7 @@ mod tests {
 
         let settings = Settings::from_url(url)?;
 
-        assert_eq!("postgres", settings.username);
+        assert_eq!(BOOTSTRAP_SUPERUSER, settings.username);
         assert_eq!("password", settings.password);
         assert_eq!("localhost", settings.host);
         assert_eq!(5432, settings.port);

postgresql_embedded/src/settings.rs

@@ -143,3 +143,24 @@ async fn postgres_concurrency() -> anyhow::Result<()> {
     }
     Ok(())
 }
+
+#[test(tokio::test)]
+async fn test_username_setting() -> Result<()> {
+    let username = "admin".to_string();
+    let settings = Settings {
+        username,
+        ..Default::default()
+    };
+    let mut postgresql = PostgreSQL::new(LATEST, settings);
+    postgresql.setup().await?;
+    postgresql.start().await?;
+
+    let database_name = "test";
+    postgresql.create_database(database_name).await?;
+    let database_exists = postgresql.database_exists(database_name).await?;
+    assert!(database_exists);
+    postgresql.drop_database(database_name).await?;
+    let database_exists = postgresql.database_exists(database_name).await?;
+    assert!(!database_exists);
+    Ok(())
+}