Merge pull request #95 from theseus-rs/utilize-sqlx-for-database-management

feat: utilize sqlx for database management to support PostgreSQL installations that do not bundle psql

Author: brianheineman

Cargo.lock

@@ -46,6 +46,7 @@ serde_json = "1.0.118"
 sha1 = "0.10.6"
 sha2 = "0.10.8"
 sha3 = "0.10.8"
+sqlx = { version = "0.7.4", default-features = false, features = ["postgres"] }
 tar = "0.4.41"
 target-triple = "0.1.3"
 test-log = "0.2.16"

Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+edition.workspace = true
+name = "zonky"
+publish = false
+license.workspace = true
+version.workspace = true
+
+[dependencies]
+postgresql_archive = { path = "../../postgresql_archive" }
+postgresql_embedded = { path = "../../postgresql_embedded" }
+tokio = { workspace = true, features = ["full"] }

examples/zonky/Cargo.toml

@@ -0,0 +1,35 @@
+#![forbid(unsafe_code)]
+#![deny(clippy::pedantic)]
+
+use postgresql_archive::configuration::zonky;
+use postgresql_archive::VersionReq;
+use postgresql_embedded::{PostgreSQL, Result, Settings};
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    let settings = Settings {
+        releases_url: zonky::URL.to_string(),
+        version: VersionReq::parse("=16.2.0")?,
+        ..Default::default()
+    };
+    let mut postgresql = PostgreSQL::new(settings);
+    postgresql.setup().await?;
+    postgresql.start().await?;
+
+    let database_name = "test";
+    postgresql.create_database(database_name).await?;
+    postgresql.database_exists(database_name).await?;
+    postgresql.drop_database(database_name).await?;
+
+    postgresql.stop().await
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_main() -> Result<()> {
+        main()
+    }
+}

examples/zonky/src/main.rs

@@ -24,6 +24,7 @@ postgresql_archive = { path = "../postgresql_archive", version = "0.12.0", defau
 postgresql_commands = { path = "../postgresql_commands", version = "0.12.0" }
 rand = { workspace = true }
 semver = { workspace = true }
+sqlx = { workspace = true, features = ["runtime-tokio"] }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"], optional = true }
@@ -39,11 +40,18 @@ tokio = { workspace = true, features = ["full"] }
 default = ["rustls-tls"]
 blocking = ["tokio"]
 bundled = []
-native-tls = ["postgresql_archive/native-tls"]
-rustls-tls = ["postgresql_archive/rustls-tls"]
+native-tls = [
+    "postgresql_archive/native-tls",
+    "sqlx/tls-native-tls",
+]
+rustls-tls = [
+    "postgresql_archive/rustls-tls",
+    "sqlx/tls-rustls",
+]
 tokio = [
     "dep:tokio",
-    "postgresql_commands/tokio"
+    "postgresql_commands/tokio",
+    "sqlx/runtime-tokio",
 ]
 
 [package.metadata.release]

postgresql_embedded/Cargo.toml

@@ -15,6 +15,9 @@ pub enum Error {
     /// Error when the database could not be created
     #[error(transparent)]
     CreateDatabaseError(anyhow::Error),
+    /// Error when accessing the database
+    #[error(transparent)]
+    DatabaseError(#[from] sqlx::Error),
     /// Error when determining if the database exists
     #[error(transparent)]
     DatabaseExistsError(anyhow::Error),