diff --git a/.idea/lib.iml b/.idea/lib.iml
index 2235a63..8366f67 100644
--- a/.idea/lib.iml
+++ b/.idea/lib.iml
@@ -9,6 +9,10 @@
+
+
+
+
diff --git a/Cargo.lock b/Cargo.lock
index 8cfd874..26e6e72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,6 +26,12 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
[[package]]
name = "async-trait"
version = "0.1.81"
@@ -37,6 +43,12 @@ dependencies = [
"syn",
]
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
[[package]]
name = "axum"
version = "0.7.5"
@@ -108,12 +120,45 @@ dependencies = [
"rustc-demangle",
]
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
[[package]]
name = "bitflags"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
[[package]]
name = "bytes"
version = "1.7.1"
@@ -135,6 +180,243 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "cpufeatures"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "deadpool"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6541a3916932fe57768d4be0b1ffb5ec7cbf74ca8c903fdfd5c0fe8aa958f0ed"
+dependencies = [
+ "deadpool-runtime",
+ "num_cpus",
+ "tokio",
+]
+
+[[package]]
+name = "deadpool-diesel"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "590573e9e29c5190a5ff782136f871e6e652e35d598a349888e028693601adf1"
+dependencies = [
+ "deadpool",
+ "deadpool-sync",
+ "diesel",
+]
+
+[[package]]
+name = "deadpool-runtime"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
+dependencies = [
+ "tokio",
+]
+
+[[package]]
+name = "deadpool-sync"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04"
+dependencies = [
+ "deadpool-runtime",
+]
+
+[[package]]
+name = "deluxe"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ed332aaf752b459088acf3dd4eca323e3ef4b83c70a84ca48fb0ec5305f1488"
+dependencies = [
+ "deluxe-core",
+ "deluxe-macros",
+ "once_cell",
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "deluxe-core"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eddada51c8576df9d6a8450c351ff63042b092c9458b8ac7d20f89cbd0ffd313"
+dependencies = [
+ "arrayvec",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
+ "syn",
+]
+
+[[package]]
+name = "deluxe-macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87546d9c837f0b7557e47b8bd6eae52c3c223141b76aa233c345c9ab41d9117"
+dependencies = [
+ "deluxe-core",
+ "heck 0.4.1",
+ "if_chain",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "diesel"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf97ee7261bb708fa3402fa9c17a54b70e90e3cb98afb3dc8999d5512cb03f94"
+dependencies = [
+ "bitflags 2.6.0",
+ "byteorder",
+ "diesel_derives",
+ "itoa",
+ "pq-sys",
+]
+
+[[package]]
+name = "diesel-async"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb799bb6f8ca6a794462125d7b8983b0c86e6c93a33a9c55934a4a5de4409d3"
+dependencies = [
+ "async-trait",
+ "deadpool",
+ "diesel",
+ "futures-util",
+ "scoped-futures",
+ "tokio",
+ "tokio-postgres",
+]
+
+[[package]]
+name = "diesel-crud-derive"
+version = "0.1.0"
+dependencies = [
+ "deluxe",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "diesel-crud-trait"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "deadpool-diesel",
+ "diesel",
+ "diesel-async",
+ "thiserror",
+]
+
+[[package]]
+name = "diesel_derives"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6ff2be1e7312c858b2ef974f5c7089833ae57b5311b334b30923af58e5718d8"
+dependencies = [
+ "diesel_table_macro_syntax",
+ "dsl_auto_type",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "diesel_table_macro_syntax"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
+dependencies = [
+ "syn",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "dsl_auto_type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607"
+dependencies = [
+ "darling",
+ "either",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
[[package]]
name = "encoding_rs"
version = "0.8.34"
@@ -144,6 +426,18 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "fallible-iterator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+
[[package]]
name = "fnv"
version = "1.0.7"
@@ -166,6 +460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
dependencies = [
"futures-core",
+ "futures-sink",
]
[[package]]
@@ -174,6 +469,17 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "futures-sink"
version = "0.3.30"
@@ -193,9 +499,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
dependencies = [
"futures-core",
+ "futures-macro",
+ "futures-sink",
"futures-task",
"pin-project-lite",
"pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
]
[[package]]
@@ -204,12 +534,39 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
[[package]]
name = "hermit-abi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
[[package]]
name = "http"
version = "1.1.0"
@@ -290,6 +647,28 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "if_chain"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
+
+[[package]]
+name = "indexmap"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
[[package]]
name = "into-response-derive"
version = "1.1.0"
@@ -304,6 +683,15 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+[[package]]
+name = "js-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+dependencies = [
+ "wasm-bindgen",
+]
+
[[package]]
name = "lazy_static"
version = "1.5.0"
@@ -315,6 +703,8 @@ name = "lib"
version = "1.4.3"
dependencies = [
"axum",
+ "diesel-crud-derive",
+ "diesel-crud-trait",
"into-response-derive",
"nom",
"read-files",
@@ -334,6 +724,16 @@ version = "0.2.158"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
[[package]]
name = "log"
version = "0.4.22"
@@ -346,6 +746,16 @@ version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
[[package]]
name = "memchr"
version = "2.7.4"
@@ -422,6 +832,16 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
[[package]]
name = "object"
version = "0.36.3"
@@ -443,12 +863,53 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.3",
+ "smallvec",
+ "windows-targets",
+]
+
[[package]]
name = "percent-encoding"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
[[package]]
name = "pin-project"
version = "1.1.5"
@@ -481,6 +942,63 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "postgres-protocol"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23"
+dependencies = [
+ "base64",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "hmac",
+ "md-5",
+ "memchr",
+ "rand",
+ "sha2",
+ "stringprep",
+]
+
+[[package]]
+name = "postgres-types"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9"
+dependencies = [
+ "bytes",
+ "fallible-iterator",
+ "postgres-protocol",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "pq-sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a24ff9e4cf6945c988f0db7005d87747bf72864965c3529d259ad155ac41d584"
+dependencies = [
+ "vcpkg",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
[[package]]
name = "proc-macro2"
version = "1.0.86"
@@ -499,6 +1017,36 @@ dependencies = [
"proc-macro2",
]
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
[[package]]
name = "read-files"
version = "0.1.0"
@@ -508,6 +1056,24 @@ dependencies = [
"syn",
]
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
[[package]]
name = "regex"
version = "1.10.6"
@@ -555,6 +1121,22 @@ version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+[[package]]
+name = "scoped-futures"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1473e24c637950c9bd38763220bea91ec3e095a89f672bbd7a10d03e77ba467"
+dependencies = [
+ "cfg-if",
+ "pin-utils",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
[[package]]
name = "serde"
version = "1.0.208"
@@ -609,6 +1191,17 @@ dependencies = [
"serde",
]
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
[[package]]
name = "sharded-slab"
version = "0.1.7"
@@ -624,6 +1217,21 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "smallvec"
version = "1.13.2"
@@ -646,6 +1254,35 @@ version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+[[package]]
+name = "stringprep"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+ "unicode-properties",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
[[package]]
name = "syn"
version = "2.0.75"
@@ -669,6 +1306,15 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+[[package]]
+name = "tests"
+version = "0.1.0"
+dependencies = [
+ "diesel",
+ "diesel-async",
+ "lib",
+]
+
[[package]]
name = "thiserror"
version = "1.0.63"
@@ -699,6 +1345,21 @@ dependencies = [
"once_cell",
]
+[[package]]
+name = "tinyvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
[[package]]
name = "tokio"
version = "1.39.3"
@@ -706,6 +1367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
dependencies = [
"backtrace",
+ "bytes",
"libc",
"mio",
"pin-project-lite",
@@ -725,6 +1387,32 @@ dependencies = [
"syn",
]
+[[package]]
+name = "tokio-postgres"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "futures-channel",
+ "futures-util",
+ "log",
+ "parking_lot",
+ "percent-encoding",
+ "phf",
+ "pin-project-lite",
+ "postgres-protocol",
+ "postgres-types",
+ "rand",
+ "socket2",
+ "tokio",
+ "tokio-util",
+ "whoami",
+]
+
[[package]]
name = "tokio-util"
version = "0.7.11"
@@ -738,6 +1426,23 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
[[package]]
name = "tower"
version = "0.4.13"
@@ -770,7 +1475,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
"bytes",
"http",
"http-body",
@@ -851,18 +1556,51 @@ dependencies = [
"tracing-log",
]
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
[[package]]
name = "unicode-ident"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+
[[package]]
name = "valuable"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
[[package]]
name = "version_check"
version = "0.9.5"
@@ -875,6 +1613,88 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+
+[[package]]
+name = "web-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "whoami"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+dependencies = [
+ "redox_syscall 0.4.1",
+ "wasite",
+ "web-sys",
+]
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -969,3 +1789,33 @@ name = "windows_x86_64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/Cargo.toml b/Cargo.toml
index b04734a..e1221ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ exclude = ["examples"]
[workspace.package]
edition = "2021"
-rust-version = "1.80.0"
+rust-version = "1.80.1"
authors = ["Martin Berg Alstad"]
homepage = "emberal.github.io"
@@ -25,8 +25,11 @@ axum = { version = "0.7", optional = true, features = ["multipart"] }
tower = { version = "0.5", optional = true }
tower-http = { version = "0.5", optional = true, features = ["trace", "cors", "normalize-path"] }
# Async
-tokio = { version = "1.38", optional = true, features = ["fs"] }
+tokio = { version = "1.39", optional = true, features = ["fs"] }
tokio-util = { version = "0.7", optional = true, features = ["io"] }
+# Database
+diesel-crud-derive = { path = "crates/diesel_crud_derive", optional = true }
+diesel-crud-trait = { path = "crates/diesel_crud_trait", optional = true }
# Error handling
thiserror = { version = "1.0", optional = true }
# Logging
@@ -43,12 +46,17 @@ serde = { version = "1.0", optional = true, features = ["derive"] }
[workspace.dependencies]
syn = "2.0"
quote = "1.0"
+deluxe = "0.5"
+proc-macro2 = "1.0"
+diesel = "2.2"
+diesel-async = "0.5"
[features]
axum = ["dep:axum", "dep:tower", "dep:tower-http", "dep:thiserror", "dep:tracing", "dep:tracing-subscriber", "dep:tokio"]
+diesel = ["dep:diesel-crud-trait"]
io = ["dep:tokio", "dep:tokio-util"]
iter = []
nom = ["dep:nom"]
serde = ["dep:serde"]
-derive = ["dep:into-response-derive", "axum", "serde"]
+derive = ["dep:into-response-derive", "dep:diesel-crud-derive"]
read-files = ["dep:read-files"]
diff --git a/Makefile b/Makefile
index 554d9f5..ef9a191 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,3 @@
fmt:
- cargo clippy --all-targets --all-features
+ cargo clippy --all-targets --all-features -- -D warnings
cargo fmt
\ No newline at end of file
diff --git a/crates/diesel_crud_derive/Cargo.toml b/crates/diesel_crud_derive/Cargo.toml
new file mode 100644
index 0000000..de77292
--- /dev/null
+++ b/crates/diesel_crud_derive/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "diesel-crud-derive"
+version = "0.1.0"
+edition = { workspace = true }
+rust-version = { workspace = true }
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { workspace = true }
+quote = { workspace = true }
+deluxe = { workspace = true }
+proc-macro2 = { workspace = true }
diff --git a/crates/diesel_crud_derive/src/common.rs b/crates/diesel_crud_derive/src/common.rs
new file mode 100644
index 0000000..32906ef
--- /dev/null
+++ b/crates/diesel_crud_derive/src/common.rs
@@ -0,0 +1,20 @@
+use quote::quote;
+
+pub(crate) fn function_body(body: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
+ quote! {
+ let connection = self.pool.get().await;
+ match connection {
+ Ok(mut connection) => {
+ use diesel::associations::HasTable;
+ #body
+ }
+ Err(error) => Err(lib::diesel_crud_trait::CrudError::PoolError(error.to_string())),
+ }
+ }
+}
+
+pub(crate) fn return_type(output: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
+ quote! {
+ std::pin::Pin> + Send + 'b>>
+ }
+}
diff --git a/crates/diesel_crud_derive/src/create.rs b/crates/diesel_crud_derive/src/create.rs
new file mode 100644
index 0000000..38359eb
--- /dev/null
+++ b/crates/diesel_crud_derive/src/create.rs
@@ -0,0 +1,49 @@
+use crate::{common, StructAttributes};
+use proc_macro2::Ident;
+use quote::quote;
+use syn::Expr;
+
+pub(crate) fn derive_diesel_crud_create_impl(
+ StructAttributes {
+ table,
+ entity,
+ create,
+ ..
+ }: &StructAttributes,
+ identifier: &Ident,
+) -> proc_macro2::TokenStream {
+ let body = function_body(table);
+ let return_type = common::return_type(quote! { Self::Entity });
+
+ quote! {
+ #[automatically_derived]
+ impl<'insertable, 'entity> lib::diesel_crud_trait::DieselCrudCreate<'insertable, 'entity, #table::table> for #identifier
+ where
+ 'entity: 'insertable,
+ {
+ type Create = #create;
+ type Entity = #entity;
+ fn create<'a, 'b>(&'a self, create: &'insertable Self::Create) -> #return_type
+ where
+ Self: Sync + 'a,
+ 'a: 'b,
+ 'insertable: 'b
+ {
+ Box::pin(async move {
+ #body
+ })
+ }
+ }
+ }
+}
+
+fn function_body(table: &Expr) -> proc_macro2::TokenStream {
+ common::function_body(quote! {
+ diesel_async::RunQueryDsl::get_result(
+ diesel::dsl::insert_into(#table::table::table()).values(create),
+ &mut connection
+ )
+ .await
+ .map_err(Into::into)
+ })
+}
diff --git a/crates/diesel_crud_derive/src/delete.rs b/crates/diesel_crud_derive/src/delete.rs
new file mode 100644
index 0000000..c586cdb
--- /dev/null
+++ b/crates/diesel_crud_derive/src/delete.rs
@@ -0,0 +1,55 @@
+use crate::{common, StructAttributes};
+use proc_macro2::Ident;
+use quote::{quote, ToTokens};
+use syn::Expr;
+
+pub(crate) fn derive_diesel_crud_delete_impl(
+ StructAttributes {
+ table,
+ pk,
+ pk_field,
+ ..
+ }: &StructAttributes,
+ identifier: &Ident,
+) -> proc_macro2::TokenStream {
+ let body = function_body(
+ table,
+ pk_field
+ .clone()
+ .map(Expr::into_token_stream)
+ .unwrap_or_else(|| quote! { id }),
+ );
+ let return_type = common::return_type(quote! { usize });
+
+ quote! {
+ #[automatically_derived]
+ impl lib::diesel_crud_trait::DieselCrudDelete for #identifier {
+ type PK = #pk;
+ fn delete<'a, 'pk, 'b>(&'a self, pk: &'pk Self::PK) -> #return_type
+ where
+ Self: Sync + 'a,
+ 'a: 'b,
+ 'pk: 'b,
+ {
+ Box::pin(async move {
+ #body
+ })
+ }
+ }
+ }
+}
+
+fn function_body(table: &Expr, pk_field: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
+ common::function_body(quote! {
+ use diesel::QueryDsl;
+ diesel_async::RunQueryDsl::execute(
+ diesel::delete(
+ #table::table
+ .filter(diesel::expression_methods::ExpressionMethods::eq(#table::#pk_field, pk))
+ ),
+ &mut connection,
+ )
+ .await
+ .map_err(Into::into)
+ })
+}
diff --git a/crates/diesel_crud_derive/src/lib.rs b/crates/diesel_crud_derive/src/lib.rs
new file mode 100644
index 0000000..450feb7
--- /dev/null
+++ b/crates/diesel_crud_derive/src/lib.rs
@@ -0,0 +1,183 @@
+extern crate proc_macro;
+
+use crate::create::derive_diesel_crud_create_impl;
+use crate::delete::derive_diesel_crud_delete_impl;
+use crate::list::derive_diesel_crud_list_impl;
+use crate::read::derive_diesel_crud_read_impl;
+use crate::update::derive_diesel_crud_update_impl;
+use deluxe::{extract_attributes, ExtractAttributes};
+use quote::quote;
+use syn::{parse_macro_input, DeriveInput, Expr, Type};
+
+mod common;
+mod create;
+mod delete;
+mod list;
+mod read;
+mod update;
+
+#[derive(ExtractAttributes)]
+#[deluxe(attributes(diesel_crud))]
+pub(crate) struct StructAttributes {
+ table: Expr,
+ #[deluxe(default)]
+ entity: Option,
+ #[deluxe(default)]
+ pk: Option,
+ #[deluxe(default)]
+ pk_field: Option,
+ #[deluxe(default)]
+ create: Option, // TODO if None, use entity?
+ #[deluxe(default)]
+ update: Option, // TODO if None, use entity?
+}
+
+// TODO get pool field automatically or by attribute
+
+/// Derives 5 functions for CRUD operations
+/// 1. create
+/// 2. read
+/// 3. update
+/// 4. delete
+/// 5. list
+#[proc_macro_derive(DieselCrud, attributes(diesel_crud))]
+pub fn derive_diesel_crud(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+ let mut item = parse_macro_input!(item as DeriveInput);
+ let struct_attributes = extract_attributes(&mut item).unwrap();
+ let identifier = item.ident;
+
+ let create = derive_diesel_crud_create_impl(&struct_attributes, &identifier);
+ let read = derive_diesel_crud_read_impl(&struct_attributes, &identifier);
+ let update = derive_diesel_crud_update_impl(&struct_attributes, &identifier);
+ let delete = derive_diesel_crud_delete_impl(&struct_attributes, &identifier);
+ let list = derive_diesel_crud_list_impl(&struct_attributes, &identifier);
+
+ let table = struct_attributes.table;
+ let expanded = quote! {
+ #create
+ #read
+ #update
+ #delete
+ #list
+
+ impl<'insertable, 'entity> lib::diesel_crud_trait::DieselCrud<'insertable, 'entity, #table::table> for #identifier
+ where
+ 'entity: 'insertable
+ {}
+ };
+ expanded.into()
+}
+
+/// Derives the create function for CRUD operations.
+/// Must be used on a struct with a field named `pool`, containing a `Pool`.
+/// # Struct Attributes
+/// - table: Ident - The schema struct for the table
+/// - result: Type - The resulting model
+/// - create: Type - The insertable model
+/// # Example
+/// ```ignore
+/// use diesel_async::{AsyncPgConnection, pooled_connection::deadpool::Pool};
+///
+/// #[derive(diesel_crud_derive::DieselCrudCreate)]
+/// #[diesel_crud(table = crate::schema::user, result = crate::models::User, create = crate::models::InsertUser)]
+/// struct TestServiceCreate {
+/// pool: Pool,
+/// }
+/// ```
+#[proc_macro_derive(DieselCrudCreate, attributes(diesel_crud))]
+pub fn derive_diesel_crud_create(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+ let mut item = syn::parse_macro_input!(item as DeriveInput);
+ let struct_attributes = extract_attributes(&mut item).unwrap();
+ derive_diesel_crud_create_impl(&struct_attributes, &item.ident).into()
+}
+
+/// Derives the read function for CRUD operations.
+/// Must be used on a struct with a field named `pool`, containing a `Pool`.
+/// # Struct Attributes
+/// - table: Ident - The schema struct for the table
+/// - pk: Type - The primary key type
+/// - result: Type - The resulting model
+/// - pk_field (optional): Expr - The field to use as the primary key. Defaults to `id`
+/// # Example
+/// ```ignore
+/// use diesel_async::{AsyncPgConnection, pooled_connection::deadpool::Pool};
+///
+/// #[derive(diesel_crud_derive::DieselCrudRead)]
+/// #[diesel_crud(table = crate::schema::user, result = crate::models::User, pk = String)]
+/// struct TestServiceRead {
+/// pool: Pool,
+/// }
+/// ```
+#[proc_macro_derive(DieselCrudRead, attributes(diesel_crud))]
+pub fn derive_diesel_crud_read(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+ let mut item = syn::parse_macro_input!(item as DeriveInput);
+ let struct_attributes = extract_attributes(&mut item).unwrap();
+ derive_diesel_crud_read_impl(&struct_attributes, &item.ident).into()
+}
+
+/// Derives the update function for CRUD operations.
+/// Must be used on a struct with a field named `pool`, containing a `Pool`.
+/// # Struct Attributes
+/// - table: Ident - The schema struct for the table
+/// - update: Type - The update model
+/// # Example
+/// ```ignore
+/// use diesel_async::{AsyncPgConnection, pooled_connection::deadpool::Pool};
+///
+/// #[derive(diesel_crud_derive::DieselCrudUpdate)]
+/// #[diesel_crud(table = crate::schema::user, update = crate::models::User)]
+/// struct TestServiceUpdate {
+/// pool: Pool,
+/// }
+/// ```
+#[proc_macro_derive(DieselCrudUpdate, attributes(diesel_crud))]
+pub fn derive_diesel_crud_update(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+ let mut item = syn::parse_macro_input!(item as DeriveInput);
+ let struct_attributes = extract_attributes(&mut item).unwrap();
+ derive_diesel_crud_update_impl(&struct_attributes, &item.ident).into()
+}
+
+/// Derives the delete function for CRUD operations.
+/// Must be used on a struct with a field named `pool`, containing a `Pool`.
+/// # Struct Attributes
+/// - table: Ident - The schema struct for the table
+/// - pk: Type - The primary key type
+/// - pk_field (optional): Expr - The field to use as the primary key. Defaults to `id`
+/// # Example
+/// ```ignore
+/// use diesel_async::{AsyncPgConnection, pooled_connection::deadpool::Pool};
+///
+/// #[derive(diesel_crud_derive::DieselCrudDelete)]
+/// #[diesel_crud(table = crate::schema::user, pk = String)]
+/// struct TestServiceDelete {
+/// pool: Pool,
+/// }
+/// ```
+#[proc_macro_derive(DieselCrudDelete, attributes(diesel_crud))]
+pub fn derive_diesel_crud_delete(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+ let mut item = syn::parse_macro_input!(item as DeriveInput);
+ let struct_attributes = extract_attributes(&mut item).unwrap();
+ derive_diesel_crud_delete_impl(&struct_attributes, &item.ident).into()
+}
+
+/// Derives the list function for CRUD operations.
+/// Must be used on a struct with a field named `pool`, containing a `Pool`.
+/// # Struct Attributes
+/// - table: Ident - The schema struct for the table
+/// - result: Type - The resulting model
+/// # Example
+/// ```ignore
+/// use diesel_async::{AsyncPgConnection, pooled_connection::deadpool::Pool};
+///
+/// #[derive(diesel_crud_derive::DieselCrudList)]
+/// #[diesel_crud(table = crate::schema::user, result = crate::models::User)]
+/// struct TestServiceList {
+/// pool: Pool,
+/// }
+/// ```
+#[proc_macro_derive(DieselCrudList, attributes(diesel_crud))]
+pub fn derive_diesel_crud_list(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+ let mut item = syn::parse_macro_input!(item as DeriveInput);
+ let struct_attributes = extract_attributes(&mut item).unwrap();
+ derive_diesel_crud_list_impl(&struct_attributes, &item.ident).into()
+}
diff --git a/crates/diesel_crud_derive/src/list.rs b/crates/diesel_crud_derive/src/list.rs
new file mode 100644
index 0000000..88ab9e9
--- /dev/null
+++ b/crates/diesel_crud_derive/src/list.rs
@@ -0,0 +1,35 @@
+use proc_macro2::Ident;
+use quote::quote;
+use syn::Expr;
+
+use crate::{common, StructAttributes};
+
+pub(crate) fn derive_diesel_crud_list_impl(
+ StructAttributes { table, entity, .. }: &StructAttributes,
+ identifier: &Ident,
+) -> proc_macro2::TokenStream {
+ let body = function_body(table);
+ let return_type = common::return_type(quote! { Vec });
+
+ quote! {
+ #[automatically_derived]
+ impl lib::diesel_crud_trait::DieselCrudList for #identifier {
+ type Entity = #entity;
+ fn list<'a, 'b>(&'a self) -> #return_type
+ where
+ Self: Sync + 'a,
+ 'a: 'b
+ {
+ Box::pin(async move {
+ #body
+ })
+ }
+ }
+ }
+}
+
+fn function_body(table: &Expr) -> proc_macro2::TokenStream {
+ common::function_body(quote! {
+ diesel_async::RunQueryDsl::get_results(#table::table::table(), &mut connection).await.map_err(Into::into)
+ })
+}
diff --git a/crates/diesel_crud_derive/src/read.rs b/crates/diesel_crud_derive/src/read.rs
new file mode 100644
index 0000000..067c75c
--- /dev/null
+++ b/crates/diesel_crud_derive/src/read.rs
@@ -0,0 +1,38 @@
+use proc_macro2::Ident;
+use quote::quote;
+use syn::Expr;
+
+use crate::{common, StructAttributes};
+
+pub(crate) fn derive_diesel_crud_read_impl(
+ StructAttributes {
+ table, entity, pk, ..
+ }: &StructAttributes,
+ identifier: &Ident,
+) -> proc_macro2::TokenStream {
+ let body = function_body(table);
+ let return_type = common::return_type(quote! { Self::Entity });
+
+ quote! {
+ #[automatically_derived]
+ impl lib::diesel_crud_trait::DieselCrudRead for #identifier {
+ type PK = #pk;
+ type Entity = #entity;
+ fn read<'a, 'b>(&'a self, pk: Self::PK) -> #return_type
+ where
+ Self: Sync + 'a,
+ 'a: 'b
+ {
+ Box::pin(async move {
+ #body
+ })
+ }
+ }
+ }
+}
+
+fn function_body(table: &Expr) -> proc_macro2::TokenStream {
+ common::function_body(quote! {
+ diesel_async::RunQueryDsl::get_result(diesel::QueryDsl::find(#table::table::table(), pk), &mut connection).await.map_err(Into::into)
+ })
+}
diff --git a/crates/diesel_crud_derive/src/update.rs b/crates/diesel_crud_derive/src/update.rs
new file mode 100644
index 0000000..a959bd7
--- /dev/null
+++ b/crates/diesel_crud_derive/src/update.rs
@@ -0,0 +1,39 @@
+use crate::{common, StructAttributes};
+use proc_macro2::Ident;
+use quote::quote;
+use syn::Expr;
+
+pub(crate) fn derive_diesel_crud_update_impl(
+ StructAttributes { table, update, .. }: &StructAttributes,
+ identifier: &Ident,
+) -> proc_macro2::TokenStream {
+ let body = function_body(table);
+ let return_type = common::return_type(quote! { usize });
+
+ quote! {
+ #[automatically_derived]
+ impl lib::diesel_crud_trait::DieselCrudUpdate for #identifier {
+ type Update = #update;
+ fn update<'a, 'b>(&'a self, update: Self::Update) -> #return_type
+ where
+ Self: Sync + 'a,
+ 'a: 'b,
+ {
+ Box::pin(async move {
+ #body
+ })
+ }
+ }
+ }
+}
+
+fn function_body(table: &Expr) -> proc_macro2::TokenStream {
+ common::function_body(quote! {
+ diesel_async::RunQueryDsl::execute(
+ diesel::dsl::update(#table::table::table()).set(update),
+ &mut connection,
+ )
+ .await
+ .map_err(Into::into)
+ })
+}
diff --git a/crates/diesel_crud_trait/Cargo.toml b/crates/diesel_crud_trait/Cargo.toml
new file mode 100644
index 0000000..ba48af4
--- /dev/null
+++ b/crates/diesel_crud_trait/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "diesel-crud-trait"
+version = "0.1.0"
+edition = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+diesel = { workspace = true, features = ["postgres"] }
+diesel-async = { workspace = true, features = ["postgres", "deadpool"] }
+async-trait = "0.1"
+deadpool-diesel = { version = "0.6", features = ["postgres"] }
+thiserror = "1.0"
diff --git a/crates/diesel_crud_trait/src/error.rs b/crates/diesel_crud_trait/src/error.rs
new file mode 100644
index 0000000..0933980
--- /dev/null
+++ b/crates/diesel_crud_trait/src/error.rs
@@ -0,0 +1,22 @@
+use diesel::result::Error;
+use thiserror::Error;
+
+/// Error type for CRUD operations
+#[derive(Debug, Error)]
+pub enum CrudError {
+ #[error("Resource not found")]
+ NotFound,
+ #[error("Database pool error: {0}")]
+ PoolError(String),
+ #[error(transparent)]
+ Other(Error),
+}
+
+impl From for CrudError {
+ fn from(error: Error) -> Self {
+ match error {
+ Error::NotFound => CrudError::NotFound,
+ _ => CrudError::Other(error),
+ }
+ }
+}
diff --git a/crates/diesel_crud_trait/src/lib.rs b/crates/diesel_crud_trait/src/lib.rs
new file mode 100644
index 0000000..028ee84
--- /dev/null
+++ b/crates/diesel_crud_trait/src/lib.rs
@@ -0,0 +1,102 @@
+mod error;
+
+pub use error::CrudError;
+
+use async_trait::async_trait;
+use diesel::{AsChangeset, Insertable};
+
+pub trait DieselCrud<'insertable, 'entity, Table>:
+ DieselCrudCreate<'insertable, 'entity, Table>
+ + DieselCrudRead
+ + DieselCrudUpdate
+ + DieselCrudDelete
+ + DieselCrudList
+where
+ 'entity: 'insertable,
+{
+}
+
+/// Insert an entity into the database
+/// The entity must implement `Insertable` for the given table.
+///
+/// Implementing the trait requires the `async_trait` macro.
+/// # Associations
+/// - `Create` - The type to insert
+/// - `Entity` - The type that will be returned
+/// # Parameters
+/// - `create` - The entity to insert
+/// # Returns
+/// A result containing the inserted entity or a `CrudError`
+#[async_trait]
+pub trait DieselCrudCreate<'insertable, 'entity, Table>
+where
+ 'entity: 'insertable,
+{
+ type Create: Insertable;
+ type Entity: 'entity;
+ async fn create(&self, create: &'insertable Self::Create) -> Result;
+}
+
+/// Gets an entity from the database
+///
+/// Implementing the trait requires the `async_trait` macro.
+/// # Associations
+/// - `PK` - The primary key of the entity
+/// - `Entity` - The type that will be returned
+/// # Parameters
+/// - `pk` - The primary key of the entity
+/// # Returns
+/// A result containing the entity or a `CrudError`.
+/// If the entity is not found, the error should be `CrudError::NotFound`.
+#[async_trait]
+pub trait DieselCrudRead {
+ type PK;
+ type Entity;
+ async fn read(&self, pk: Self::PK) -> Result;
+}
+
+/// Updates an entity in the database
+/// The entity must implement `AsChangeset` for the given table.
+///
+/// Implementing the trait requires the `async_trait` macro.
+/// # Associations
+/// - `Update` - The type to update
+/// # Parameters
+/// - `update` - The update to apply
+/// # Returns
+/// A result containing the number of rows updated or a `CrudError`.
+/// If the entity is not found, the error should be `CrudError::NotFound`.
+#[async_trait]
+pub trait DieselCrudUpdate {
+ type Update: AsChangeset;
+ async fn update(&self, update: Self::Update) -> Result;
+}
+
+/// Deletes an entity from the database
+///
+/// Implementing the trait requires the `async_trait` macro.
+/// # Associations
+/// - `PK` - The primary key of the entity
+/// # Parameters
+/// - `pk` - The primary key of the entity
+/// # Returns
+/// A result containing the number of rows deleted or a `CrudError`.
+/// If the entity is not found, the error should be `CrudError::NotFound`.
+#[async_trait]
+pub trait DieselCrudDelete {
+ type PK;
+ async fn delete(&self, pk: &Self::PK) -> Result;
+}
+
+/// Lists all entities in the table
+///
+/// Implementing the trait requires the `async_trait` macro.
+/// # Associations
+/// - `Entity` - The type that will be returned in a Vec
+/// # Returns
+/// A result containing a Vec of entities or a `CrudError`.
+#[async_trait]
+pub trait DieselCrudList {
+ type Entity;
+ async fn list(&self) -> Result, CrudError>;
+}
diff --git a/crates/tests/Cargo.toml b/crates/tests/Cargo.toml
new file mode 100644
index 0000000..56ad739
--- /dev/null
+++ b/crates/tests/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "tests"
+version = "0.1.0"
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+
+[dependencies]
+diesel = { workspace = true }
+diesel-async = { workspace = true }
+lib = { path = "../../../lib", features = ["diesel", "derive"] }
diff --git a/crates/tests/src/lib.rs b/crates/tests/src/lib.rs
new file mode 100644
index 0000000..0bda5f7
--- /dev/null
+++ b/crates/tests/src/lib.rs
@@ -0,0 +1 @@
+// This file is needed to make the tests directory a crate
diff --git a/crates/tests/tests/diesel_crud_derive.rs b/crates/tests/tests/diesel_crud_derive.rs
new file mode 100644
index 0000000..5224f02
--- /dev/null
+++ b/crates/tests/tests/diesel_crud_derive.rs
@@ -0,0 +1,82 @@
+#![allow(unused)]
+use diesel::{AsChangeset, Insertable, Queryable, Selectable};
+use diesel_async::pooled_connection::deadpool::Pool;
+use diesel_async::pooled_connection::AsyncDieselConnectionManager;
+use diesel_async::AsyncPgConnection;
+use lib::diesel_crud_derive::{
+ DieselCrud, DieselCrudCreate, DieselCrudDelete, DieselCrudList, DieselCrudRead,
+ DieselCrudUpdate,
+};
+use lib::diesel_crud_trait::DieselCrudCreate;
+
+diesel::table! {
+ user (email) {
+ #[max_length = 255]
+ email -> Varchar,
+ }
+}
+
+#[derive(Queryable, Selectable, Insertable, AsChangeset)]
+#[diesel(table_name = user)]
+struct User {
+ email: String,
+}
+
+#[derive(Insertable)]
+#[diesel(table_name = user)]
+struct InsertUser {
+ email: String,
+}
+
+#[derive(DieselCrud)]
+#[diesel_crud(table = user, entity = User, pk = String, pk_field = email, create = InsertUser, update = User)]
+struct TestService {
+ pool: Pool,
+}
+
+#[derive(DieselCrudCreate, DieselCrudRead, DieselCrudUpdate, DieselCrudDelete, DieselCrudList)]
+#[diesel_crud(table = user, entity = User, pk = String, pk_field = email, create = InsertUser, update = User)]
+struct TestServiceSeparate {
+ pool: Pool,
+}
+
+#[derive(DieselCrudCreate)]
+#[diesel_crud(table = user, entity = User, create = InsertUser)]
+struct TestServiceCreate {
+ pool: Pool,
+}
+
+#[derive(DieselCrudRead)]
+#[diesel_crud(table = user, entity = User, pk = String)]
+struct TestServiceRead {
+ pool: Pool,
+}
+
+#[derive(DieselCrudUpdate)]
+#[diesel_crud(table = user, update = User)]
+struct TestServiceUpdate {
+ pool: Pool,
+}
+
+#[derive(DieselCrudDelete)]
+#[diesel_crud(table = user, pk = String, pk_field = email)]
+struct TestServiceDelete {
+ pool: Pool,
+}
+
+#[derive(DieselCrudList)]
+#[diesel_crud(table = user, entity = User)]
+struct TestServiceList {
+ pool: Pool,
+}
+
+#[test]
+fn test_insert_user() {
+ let config = AsyncDieselConnectionManager::::new("");
+ let pool = Pool::builder(config).max_size(10).build().unwrap();
+
+ let service = TestServiceCreate { pool };
+ service.create(&InsertUser {
+ email: "test".to_string(),
+ });
+}
diff --git a/examples/multipart_file/Cargo.lock b/examples/multipart_file/Cargo.lock
index c3e0a63..65e6cd6 100644
--- a/examples/multipart_file/Cargo.lock
+++ b/examples/multipart_file/Cargo.lock
@@ -338,13 +338,14 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.11"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
+ "hermit-abi",
"libc",
"wasi",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -383,16 +384,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
[[package]]
name = "object"
version = "0.36.1"
@@ -563,7 +554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
- "windows-sys 0.52.0",
+ "windows-sys",
]
[[package]]
@@ -627,25 +618,24 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.38.0"
+version = "1.39.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
dependencies = [
"backtrace",
"libc",
"mio",
- "num_cpus",
"pin-project-lite",
"socket2",
"tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
@@ -811,37 +801,13 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows-targets",
]
[[package]]
@@ -850,46 +816,28 @@ version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
]
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
[[package]]
name = "windows_i686_gnu"
version = "0.52.5"
@@ -902,48 +850,24 @@ version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
[[package]]
name = "windows_i686_msvc"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.5"
diff --git a/examples/multipart_file/Cargo.toml b/examples/multipart_file/Cargo.toml
index e6ac861..e1634bd 100644
--- a/examples/multipart_file/Cargo.toml
+++ b/examples/multipart_file/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
[dependencies]
lib = { path = "../..", features = ["axum"] }
axum = "0.7.5"
-tokio = { version = "1.38.0", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.39", features = ["rt-multi-thread", "macros"] }
diff --git a/src/lib.rs b/src/lib.rs
index 8b565ab..c3a120c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,10 @@
#![allow(dead_code)]
-#[cfg(all(feature = "derive", feature = "serde"))]
+#[cfg(all(feature = "derive", feature = "diesel"))]
+pub extern crate diesel_crud_derive;
+#[cfg(feature = "diesel")]
+pub extern crate diesel_crud_trait;
+#[cfg(all(feature = "derive", feature = "axum", feature = "serde"))]
pub extern crate into_response_derive;
#[cfg(feature = "read-files")]
pub extern crate read_files;