Sqlite and MySql support for asynk

.github/workflows/rust.yml

@@ -49,15 +49,29 @@ jobs:
           command: clippy
           args: --verbose --all-targets --all-features -- -D warnings
 
+      - name: Install sqlite3
+        run: | 
+          sudo apt install -y sqlite3
+          sqlite3 fang.db "VACUUM;"
+          mkdir tests_sqlite
+
       - name: Install diesel-cli
         uses: actions-rs/cargo@v1
         with:
           command: install
-          args: diesel_cli --no-default-features --features "postgres"
+          args: diesel_cli --no-default-features --features "postgres sqlite mysql"
+
+      - name: Setup Sqlite db
+        working-directory: ./fang/sqlite_migrations
+        run: diesel setup --database-url "sqlite3://../../../fang.db"
+
+      - name: Change working dir
+        working-directory: ./../..
+        run: pwd
 
       - name: Setup Postgres db
         working-directory: ./fang/postgres_migrations
-        run: diesel setup
+        run: diesel setup --database-url "postgres://postgres:postgres@localhost/fang"
 
       - name: Change working dir
         working-directory: ./../..

.gitignore

@@ -4,3 +4,4 @@ src/schema.rs
 docs/content/docs/CHANGELOG.md
 docs/content/docs/README.md
 fang.db
+tests_sqlite/

fang/Cargo.toml

@@ -15,22 +15,28 @@ rust-version = "1.62"
 doctest = false
 
 [features]
-default = ["blocking", "asynk", "derive-error", "postgres", "mysql" , "sqlite", "migrations_postgres", "migrations_sqlite" , "migrations_mysql"]
-blocking = ["dep:diesel", "dep:diesel-derive-enum", "dep:dotenvy", "diesel?/chrono" , "diesel?/serde_json" , "diesel?/uuid"]
-asynk = ["dep:bb8-postgres", "dep:postgres-types", "dep:tokio", "dep:async-trait", "dep:async-recursion"]
+default = ["blocking", "asynk-sqlx", "derive-error", "blocking-postgres", "blocking-mysql" , "blocking-sqlite", "migrations-postgres", "migrations-sqlite" , "migrations-mysql"]
+asynk-postgres = ["asynk-sqlx" , "sqlx?/postgres"]
+asynk-sqlite = ["asynk-sqlx" , "sqlx?/sqlite"]
+asynk-mysql = ["asynk-sqlx"  , "sqlx?/mysql"]
+asynk-sqlx = ["asynk" , "dep:sqlx"]
+asynk = ["dep:tokio", "dep:async-trait", "dep:async-recursion" ]
 derive-error = ["dep:fang-derive-error"]
-postgres = ["diesel?/postgres" , "diesel?/serde_json", "diesel?/chrono" , "diesel?/uuid" , "diesel?/r2d2"]
-sqlite = ["diesel?/sqlite" , "diesel?/serde_json", "diesel?/chrono" , "diesel?/uuid" , "diesel?/r2d2"]
-mysql = ["diesel?/mysql" , "diesel?/serde_json", "diesel?/chrono" , "diesel?/uuid" , "diesel?/r2d2"]
-migrations_postgres = ["migrations"]
-migrations_sqlite = ["migrations"]
-migrations_mysql = ["migrations"]
+blocking = ["dep:diesel", "dep:diesel-derive-enum", "dep:dotenvy", "diesel?/chrono" , "diesel?/serde_json" , "diesel?/uuid", "diesel?/r2d2"]
+blocking-postgres = [ "blocking", "diesel?/postgres"]
+blocking-sqlite = ["blocking", "diesel?/sqlite" ]
+blocking-mysql = [ "blocking", "diesel?/mysql"]
+migrations-postgres = ["migrations"]
+migrations-sqlite = ["migrations"]
+migrations-mysql = ["migrations"]
 migrations = ["dep:diesel_migrations"]
 
 
 [dev-dependencies]
 fang-derive-error = { version = "0.1.0"}
 diesel_migrations = { version = "2.1" , features = ["postgres", "sqlite" , "mysql"]}
+sqlx = {git = "https://github.com/pxp9/sqlx", branch = "main", features = ["any" , "macros" , "runtime-tokio", "postgres", "sqlite", "mysql"]}
+
 
 [dependencies]
 cron = "0.12"
@@ -46,6 +52,10 @@ typed-builder = "0.14"
 typetag = "0.2"
 uuid = { version = "1.1", features = ["v4"] }
 fang-derive-error = { version = "0.1.0" , optional = true}
+# sqlx with no TLS, if you want TLS you must to get feature "tls-native-tls" or "tls-rustls"
+#sqlx = {version = "0.7", features = ["any" , "macros" , "json" , "uuid" , "chrono" , "runtime-tokio", "postgres", "sqlite", "mysql"] }
+# https://github.com/launchbadge/sqlx/issues/2416 is fixed in pxp9's fork
+sqlx = {git = "https://github.com/pxp9/sqlx", branch = "main", features = ["any" , "macros" , "runtime-tokio"] , optional = true}
 
 [dependencies.diesel]
 version = "2.1"
@@ -61,16 +71,6 @@ optional = true
 version = "0.15"
 optional = true
 
-[dependencies.bb8-postgres]
-version = "0.8"
-features = ["with-serde_json-1" , "with-uuid-1" , "with-chrono-0_4"]
-optional = true
-
-[dependencies.postgres-types]
-version = "0.X.X"
-features = ["derive"]
-optional = true
-
 [dependencies.tokio]
 version = "1.25"
 features = ["rt", "time", "macros"]

fang/fang_examples/asynk/simple_async_worker/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-fang = { path = "../../../" , features = ["asynk", "postgres"]}
+fang = { path = "../../../" , features = ["asynk-postgres", "migrations-postgres"]}
 env_logger = "0.9.0"
 log = "0.4.0"
 dotenvy = "0.15"

fang/fang_examples/asynk/simple_async_worker/src/main.rs

@@ -7,7 +7,6 @@ use fang::asynk::async_queue::AsyncQueueable;
 use fang::asynk::async_worker_pool::AsyncWorkerPool;
 use fang::run_migrations_postgres;
 use fang::AsyncRunnable;
-use fang::NoTls;
 use simple_async_worker::MyFailingTask;
 use simple_async_worker::MyTask;
 use std::env;
@@ -36,10 +35,10 @@ async fn main() {
         .max_pool_size(max_pool_size)
         .build();
 
-    queue.connect(NoTls).await.unwrap();
+    queue.connect().await.unwrap();
     log::info!("Queue connected...");
 
-    let mut pool: AsyncWorkerPool<AsyncQueue<NoTls>> = AsyncWorkerPool::builder()
+    let mut pool: AsyncWorkerPool<AsyncQueue> = AsyncWorkerPool::builder()
         .number_of_workers(10_u32)
         .queue(queue.clone())
         .build();

fang/fang_examples/asynk/simple_cron_async_worker/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-fang = { path = "../../../" , features = ["asynk"]}
+fang = { path = "../../../" , features = ["asynk-postgres"]}
 env_logger = "0.9.0"
 log = "0.4.0"
 dotenvy = "0.15"

fang/fang_examples/asynk/simple_cron_async_worker/src/main.rs

@@ -3,7 +3,6 @@ use fang::asynk::async_queue::AsyncQueue;
 use fang::asynk::async_queue::AsyncQueueable;
 use fang::asynk::async_worker_pool::AsyncWorkerPool;
 use fang::AsyncRunnable;
-use fang::NoTls;
 use simple_cron_async_worker::MyCronTask;
 use std::env;
 use std::time::Duration;
@@ -21,10 +20,10 @@ async fn main() {
         .max_pool_size(max_pool_size)
         .build();
 
-    queue.connect(NoTls).await.unwrap();
+    queue.connect().await.unwrap();
     log::info!("Queue connected...");
 
-    let mut pool: AsyncWorkerPool<AsyncQueue<NoTls>> = AsyncWorkerPool::builder()
+    let mut pool: AsyncWorkerPool<AsyncQueue> = AsyncWorkerPool::builder()
         .number_of_workers(10_u32)
         .queue(queue.clone())
         .build();

fang/postgres_migrations/migrations/2022-08-20-151615_create_fang_tasks/up.sql

@@ -3,12 +3,12 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 CREATE TYPE fang_task_state AS ENUM ('new', 'in_progress', 'failed', 'finished', 'retried');
 
 CREATE TABLE fang_tasks (
-     id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+     id BYTEA PRIMARY KEY,
      metadata jsonb NOT NULL,
      error_message TEXT,
      state fang_task_state DEFAULT 'new' NOT NULL,
-     task_type VARCHAR DEFAULT 'common' NOT NULL,
-     uniq_hash CHAR(64),
+     task_type TEXT DEFAULT 'common' NOT NULL,
+     uniq_hash TEXT, -- just for compatibility with sqlx is text
      retries INTEGER DEFAULT 0 NOT NULL,
      scheduled_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
      created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),

fang/sqlite_migrations/migrations/2023-08-17-102017_create_fang_tasks/up.sql

@@ -4,8 +4,8 @@
 -- docker exec -ti mysql mysql -u root -pfang -P 3360 fang -e "$(catn fang/mysql_migrations/migrations/2023-08-17-102017_create_fang_tasks/up.sql)"
 
 CREATE TABLE fang_tasks (
-    id TEXT CHECK (LENGTH(id) = 36) NOT NULL PRIMARY KEY, -- UUID generated inside the language
-    -- why uuid is a text ? https://stackoverflow.com/questions/17277735/using-uuids-in-sqlite
+    id BLOB NOT NULL PRIMARY KEY, -- UUID generated inside the language
+    -- why uuid is a blob ? https://stackoverflow.com/questions/17277735/using-uuids-in-sqlite
     metadata TEXT NOT NULL, 
     -- why metadata is text ? https://stackoverflow.com/questions/16603621/how-to-store-json-object-in-sqlite-database#16603687
     error_message TEXT,
@@ -16,10 +16,10 @@ CREATE TABLE fang_tasks (
     retries INTEGER NOT NULL DEFAULT 0,
     -- The datetime() function returns the date and time as text in this formats: YYYY-MM-DD HH:MM:SS. 
     -- https://www.sqlite.org/lang_datefunc.html
-    scheduled_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    scheduled_at TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP || '.000000+00'),
     -- why timestamps are texts ? https://www.sqlite.org/datatype3.html
-    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+    created_at TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP || '.000000+00'),
+    updated_at TEXT NOT NULL DEFAULT (CURRENT_TIMESTAMP || '.000000+00')
 );
 
 CREATE INDEX fang_tasks_state_index ON fang_tasks(state);