From fb9f9d243da7e167a8c3363a4ea87f7538cd0be6 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 6 Feb 2022 08:31:17 +0000
Subject: [PATCH] disable db/diesel for now

---
 Cargo.lock                        | 30 ++----------------------------
 Cargo.toml                        |  3 ++-
 session/redis-session/src/main.rs |  2 +-
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 755d7f68..9c731475 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2255,27 +2255,11 @@ dependencies = [
  "byteorder",
  "chrono",
  "diesel_derives",
- "libsqlite3-sys 0.9.1",
  "pq-sys",
  "r2d2",
  "uuid",
 ]
 
-[[package]]
-name = "diesel-example"
-version = "1.0.0"
-dependencies = [
- "actix-web 4.0.0-rc.2",
- "diesel",
- "dotenv",
- "env_logger 0.9.0",
- "failure",
- "futures",
- "serde 1.0.136",
- "serde_json",
- "uuid",
-]
-
 [[package]]
 name = "diesel_derives"
 version = "1.4.1"
@@ -3474,16 +3458,6 @@ version = "0.2.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
 
-[[package]]
-name = "libsqlite3-sys"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e9eb7b8e152b6a01be6a4a2917248381875758250dc3df5d46caf9250341dda"
-dependencies = [
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "libsqlite3-sys"
 version = "0.23.2"
@@ -5053,7 +5027,7 @@ dependencies = [
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
- "libsqlite3-sys 0.23.2",
+ "libsqlite3-sys",
  "memchr",
  "smallvec",
 ]
@@ -5659,7 +5633,7 @@ dependencies = [
  "indexmap",
  "itoa 1.0.1",
  "libc",
- "libsqlite3-sys 0.23.2",
+ "libsqlite3-sys",
  "log",
  "memchr",
  "once_cell",
diff --git a/Cargo.toml b/Cargo.toml
index f5221b41..f0852fdf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,8 @@ members = [
    "basics/static_index",
    "basics/todo",
    "database_interactions/basic",
-   "database_interactions/diesel",
+   # example uses incompatible libsqlite-sys to other examples
+   # "database_interactions/diesel",
    "database_interactions/mongodb",
    "database_interactions/pg",
    "database_interactions/redis",
diff --git a/session/redis-session/src/main.rs b/session/redis-session/src/main.rs
index 64e7a1d9..336391e2 100644
--- a/session/redis-session/src/main.rs
+++ b/session/redis-session/src/main.rs
@@ -84,7 +84,7 @@ async fn main() -> std::io::Result<()> {
     HttpServer::new(move || {
         App::new()
             // redis session middleware
-            .wrap(RedisSession::new("127.0.0.1:6379", &private_key.master()))
+            .wrap(RedisSession::new("127.0.0.1:6379", private_key.master()))
             // enable logger - always register Actix Web Logger middleware last
             .wrap(middleware::Logger::default())
             .service(resource("/").route(get().to(index)))