From b68157d7fedf125c1c4a89140f66bfb756f1ec24 Mon Sep 17 00:00:00 2001 From: Aaron Gorodetzky Date: Sat, 15 Feb 2025 00:20:43 -0500 Subject: [PATCH] Remove diesel --- Cargo.lock | 218 ------------------ Cargo.toml | 2 - db/fdb.sqlite | Bin 20480 -> 0 bytes diesel.toml | 9 - migrations/.keep | 0 .../2025-01-30-043603_create_files/down.sql | 2 - .../nytedb/database/create_db.sql | 0 7 files changed, 231 deletions(-) delete mode 100644 db/fdb.sqlite delete mode 100644 diesel.toml delete mode 100644 migrations/.keep delete mode 100644 migrations/2025-01-30-043603_create_files/down.sql rename migrations/2025-01-30-043603_create_files/up.sql => src/nytedb/database/create_db.sql (100%) diff --git a/Cargo.lock b/Cargo.lock index 061245a..400381d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,15 +57,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -[[package]] -name = "cc" -version = "1.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" -dependencies = [ - "shlex", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -121,83 +112,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" -[[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", - "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 = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "diesel" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf1bedf64cdb9643204a36dd15b19a6ce8e7aa7f7b105868e9f1fad5ffa7d12" -dependencies = [ - "diesel_derives", - "libsqlite3-sys", - "time", -] - -[[package]] -name = "diesel_derives" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" -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 = "dirs" version = "5.0.1" @@ -225,26 +139,6 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[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", - "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 = "errno" version = "0.3.10" @@ -261,12 +155,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "getrandom" version = "0.2.15" @@ -284,24 +172,12 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "is_terminal_polyfill" version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itoa" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" - [[package]] name = "lazy_static" version = "1.5.0" @@ -324,17 +200,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libsqlite3-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -357,21 +222,13 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - [[package]] name = "nytefdb" version = "0.1.0" dependencies = [ "clap", - "diesel", "dirs", "dotenvy", - "libsqlite3-sys", "tempfile", "thiserror 2.0.11", "tracing", @@ -402,18 +259,6 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "proc-macro2" version = "1.0.92" @@ -456,26 +301,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "serde" -version = "1.0.217" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.217" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -485,12 +310,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "smallvec" version = "1.13.2" @@ -588,37 +407,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.3.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tracing" version = "0.1.41" @@ -706,12 +494,6 @@ 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 = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index f9cc016..51d4d6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,8 +9,6 @@ tracing = "0.1" tracing-subscriber = "0.3" clap = { version = "4.5.24", features = ["derive", "unstable-doc"] } thiserror = "2.0.11" -libsqlite3-sys = { version = "0.30", features = ["bundled"] } -diesel = { version = "2.2.6", features = ["sqlite"] } dotenvy = "0.15.7" [dev-dependencies] diff --git a/db/fdb.sqlite b/db/fdb.sqlite deleted file mode 100644 index 7694b1dc1b1b814ebb889ed2b2c6158e327eedfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 zcmeI(&r;Js90%}(7SIk*J>|LwXWGnwleClrjx)p(q(do~1_w?%q21DqO^ex};7!Jh z58=s|@fmyw&mP^~QViH|R{ZWHP15~kcYmMxO=tSA{i+!zjPyov6eOgoJ<@bt+aN^K zw7l47#Xf0s;zT|-Y5L^kj$>YXdbzP!{Hf&^Y;EaV@#})U^yQ9tbU^?D5P$##AOHaf zKmY=Nlfb7iH*Xk*{@G4~;{of11IE=uzV5k>?-Jj6(R7J=ij)gPG~N#?wKdugcwb)1 z=DUZ!Jht|H(mH51msOy=iJk_@by!y5alqLyh?pGWs!bn}hab{GGPcq3-IuO+Yif3$ zuptje!^wE#sZ;ApE>2TJ-JXurx83>Q%JtE~)eJrcOQ8i!|Ofx@c zJU4VL9Cq0`e>)KGRB3RQjMOz%B}Q#^nEiOD&l`@TUp`Z1NohA^oDC@N^jQ?pC_IUk z9?$NXxlzE`aaUC>5`4#ERWh#~ufFYg<(g%ZbY?fJTig(z4XG$Gzp?AKeP?(7x(Lap zyX71-eNsR0Jh$c3>yU!ko|!XFoGgXxby7RKFDG779>|xKMX~F}@0!@qAOHafKmY;| zfB*y_009U<00I#B=LDYUIkQ@^DmBZlTGncH%~Dq@R%OMm5o>k5R$aI3g2+oR{?NpR z1_1~_00Izz00bZa0SG_<0uX?}y%2buGaugkNI-u7FMjlo1_1~_00Izz00bZa0SG_< t0uX?}Jr4 diff --git a/diesel.toml b/diesel.toml deleted file mode 100644 index 18d62e3..0000000 --- a/diesel.toml +++ /dev/null @@ -1,9 +0,0 @@ -# For documentation on how to configure this file, -# see https://diesel.rs/guides/configuring-diesel-cli - -[print_schema] -file = "src/schema.rs" -custom_type_derives = ["diesel::query_builder::QueryId", "Clone"] - -[migrations_directory] -dir = "/home/aargonian/Projects/Programming/nytefdb/migrations" diff --git a/migrations/.keep b/migrations/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/migrations/2025-01-30-043603_create_files/down.sql b/migrations/2025-01-30-043603_create_files/down.sql deleted file mode 100644 index 0ad9df9..0000000 --- a/migrations/2025-01-30-043603_create_files/down.sql +++ /dev/null @@ -1,2 +0,0 @@ --- This file should undo anything in `up.sql` -DROP TABLE files; diff --git a/migrations/2025-01-30-043603_create_files/up.sql b/src/nytedb/database/create_db.sql similarity index 100% rename from migrations/2025-01-30-043603_create_files/up.sql rename to src/nytedb/database/create_db.sql