Updates, development environment

Cargo.toml

@@ -15,24 +15,24 @@ members = ["sqlxmq_macros", "sqlxmq_stress"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sqlx = { version = "0.7.1", features = ["postgres", "chrono", "uuid"] }
-tokio = { version = "1.8.3", features = ["full"] }
-dotenv = "0.15.0"
-chrono = "0.4.19"
-uuid = { version = "1.1.2", features = ["v4"] }
-log = "0.4.14"
-serde_json = "1.0.64"
-serde = "1.0.124"
+sqlx = { version = "~0.8.1", features = ["postgres", "chrono", "uuid"] }
+tokio = { version = "~1.38", features = ["full"] }
+dotenvy = "~0.15.7"
+chrono = "~0.4.19"
+uuid = { version = "~1.1", features = ["v4"] }
+log = "~0.4"
+serde_json = "~1.0"
+serde = "~1.0"
 sqlxmq_macros = { version = "0.5.0", path = "sqlxmq_macros" }
-anymap2 = "0.13.0"
+anymap2 = "~0.13"
 
 [features]
 default = ["runtime-tokio-native-tls"]
 runtime-tokio-native-tls = ["sqlx/runtime-tokio-native-tls"]
 runtime-tokio-rustls = ["sqlx/runtime-tokio-rustls"]
 
 [dev-dependencies]
-dotenv = "0.15.0"
+dotenvy = "0.15.0"
 pretty_env_logger = "0.4.0"
 futures = "0.3.13"
 tokio = { version = "1", features = ["full"] }

devsupport/.gitignore

@@ -0,0 +1,3 @@
+db/
+db_sockets/
+!db_sockets/.gitkeep

devsupport/run_postgres.sh

@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+
+set -e
+devsupport=$(realpath $(dirname $0))
+if [ ! -d "$PGDATA" ]; then
+  initdb --no-instructions
+fi
+exec postgres -c listen_addresses= -c unix_socket_directories="${devsupport}/db_sockets"

devsupport/setup_postgres.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sqlx database create
+sqlx migrate run

envrc.example

@@ -0,0 +1,7 @@
+export db_socket_path=$(echo $(pwd)/devsupport/db_sockets)
+export PGDATA="$(pwd)/devsupport/db"
+export DATABASE_URL="postgres:///sqlxmq?host=$db_socket_path&sslmode=disable"
+# export SQLX_OFFLINE=yes
+
+session_name sqlxmq
+use lorri

examples/graceful-shutdown.rs

@@ -4,7 +4,7 @@ use tokio::time;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     let db = sqlx::PgPool::connect(&std::env::var("DATABASE_URL").unwrap()).await?;
 
     sleep.builder().set_json(&5u64)?.spawn(&db).await?;

flake.nix

@@ -0,0 +1,36 @@
+{
+  description = "sqlxmq is a message queue built by Diggsey on rust sqlx";
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/24.05";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+  outputs = { self, nixpkgs, flake-utils }:
+  flake-utils.lib.eachDefaultSystem (system:
+  let
+    pkgs = (import "${nixpkgs}" {
+      inherit system;
+    });
+
+    runDeps = with pkgs; [
+      openssl
+    ];
+
+    buildDeps = with pkgs; [
+      pkg-config
+    ] ++ runDeps;
+  in rec {
+    devShells.devShell.${system} = pkgs.mkShell {
+      buildInputs = with pkgs; [
+        cargo
+        cargo-expand
+        rustc
+        rust-analyzer
+        clippy
+
+        postgresql
+        sqlx-cli
+      ] ++ buildDeps;
+    };
+    devShells.default = devShells.devShell.${system};
+  });
+}

sqlxmq_stress/src/main.rs

@@ -80,7 +80,7 @@ async fn schedule_tasks(num_jobs: usize, interval: Duration, pool: Pool<Postgres
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    let _ = dotenv::dotenv();
+    let _ = dotenvy::dotenv();
 
     let pool = Pool::connect(&env::var("DATABASE_URL")?).await?;
 

src/lib.rs

@@ -278,6 +278,8 @@ mod tests {
     use tokio::sync::{Mutex, MutexGuard};
     use tokio::task;
 
+    // field 0 is never read, but its drop is important
+    #[allow(dead_code)]
     struct TestGuard<T>(MutexGuard<'static, ()>, T);
 
     impl<T> Deref for TestGuard<T> {
@@ -294,7 +296,7 @@ mod tests {
 
         let guard = TEST_MUTEX.lock().await;
 
-        let _ = dotenv::dotenv();
+        let _ = dotenvy::dotenv();
 
         INIT_LOGGER.call_once(pretty_env_logger::init);