From c9ddbc70bd7558c5d6f23e8a3eb4fa69afeafbd3 Mon Sep 17 00:00:00 2001
From: Bassem Girgis <bgirgis@pm.me>
Date: Thu, 19 Aug 2021 21:49:29 -0500
Subject: [PATCH] use option version

---
 src/check_maria_db.rs | 15 +++++++++++++--
 src/check_mysql.rs    | 15 +++++++++++++--
 src/check_postgres.rs | 15 +++++++++++++--
 src/check_sqlite.rs   | 16 ++++++++++------
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/check_maria_db.rs b/src/check_maria_db.rs
index b5f61ef..3af8077 100644
--- a/src/check_maria_db.rs
+++ b/src/check_maria_db.rs
@@ -1,11 +1,22 @@
 use log::info;
 
-use sqlx::mysql::MySqlPoolOptions;
+use sqlx::mysql::{
+    MySqlConnectOptions,
+    MySqlPoolOptions,
+};
 
 pub async fn check_maria_db() -> Result<(), sqlx::Error> {
+    // "mysql://demo_user:demo_pass@localhost:8084/demo"
+    let options = MySqlConnectOptions::new()
+        .host("localhost")
+        .port(8084)
+        .database("demo")
+        .username("demo_user")
+        .password("demo_pass");
+
     let pool = MySqlPoolOptions::new()
         .max_connections(5)
-        .connect("mysql://demo_user:demo_pass@localhost:8084/demo")
+        .connect_with(options)
         .await?;
 
     // Make a simple query to return the given parameter
diff --git a/src/check_mysql.rs b/src/check_mysql.rs
index 7d288a1..a06e826 100644
--- a/src/check_mysql.rs
+++ b/src/check_mysql.rs
@@ -1,11 +1,22 @@
 use log::info;
 
-use sqlx::mysql::MySqlPoolOptions;
+use sqlx::mysql::{
+    MySqlConnectOptions,
+    MySqlPoolOptions,
+};
 
 pub async fn check_mysql() -> Result<(), sqlx::Error> {
+    // "mysql://demo_user:demo_pass@localhost:8086/demo"
+    let options = MySqlConnectOptions::new()
+        .host("localhost")
+        .port(8086)
+        .database("demo")
+        .username("demo_user")
+        .password("demo_pass");
+
     let pool = MySqlPoolOptions::new()
         .max_connections(5)
-        .connect("mysql://demo_user:demo_pass@localhost:8086/demo")
+        .connect_with(options)
         .await?;
 
     // Make a simple query to return the given parameter
diff --git a/src/check_postgres.rs b/src/check_postgres.rs
index 3d52445..0ee6a01 100644
--- a/src/check_postgres.rs
+++ b/src/check_postgres.rs
@@ -1,11 +1,22 @@
 use log::info;
 
-use sqlx::postgres::PgPoolOptions;
+use sqlx::postgres::{
+    PgConnectOptions,
+    PgPoolOptions,
+};
 
 pub async fn check_postgres() -> Result<(), sqlx::Error> {
+    // "postgres://demo_user:demo_pass@localhost:8087/demo"
+    let options = PgConnectOptions::new()
+        .host("localhost")
+        .port(8087)
+        .database("demo")
+        .username("demo_user")
+        .password("demo_pass");
+
     let pool = PgPoolOptions::new()
         .max_connections(5)
-        .connect("postgres://demo_user:demo_pass@localhost:8087/demo")
+        .connect_with(options)
         .await?;
 
     // Make a simple query to return the given parameter
diff --git a/src/check_sqlite.rs b/src/check_sqlite.rs
index f57d5a2..d2ba72a 100644
--- a/src/check_sqlite.rs
+++ b/src/check_sqlite.rs
@@ -1,15 +1,19 @@
 use log::info;
 
-use sqlx::sqlite::SqlitePoolOptions;
+use sqlx::sqlite::{
+    SqliteConnectOptions,
+    SqlitePoolOptions,
+};
 
 pub async fn check_sqlite() -> Result<(), sqlx::Error> {
-    // Create a connection pool
-    //  for MySQL, use MySqlPoolOptions::new()
-    //  for SQLite, use SqlitePoolOptions::new()
-    //  etc.
+    // "sqlite://test.db"
+    let options = SqliteConnectOptions::new()
+        .filename("test.db")
+        .create_if_missing(true);
+
     let pool = SqlitePoolOptions::new()
         .max_connections(5)
-        .connect("sqlite://test.db")
+        .connect_with(options)
         .await?;
 
     // Make a simple query to return the given parameter