diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36f85f2..6b0ace6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,9 @@ on: pull_request: branches: [main] +permissions: + contents: read + env: CARGO_TERM_COLOR: always RUSTFLAGS: "-Dwarnings" @@ -26,10 +29,17 @@ jobs: rust: "1.75" steps: - uses: actions/checkout@v6 - - uses: dtolnay/rust-toolchain@master + - uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.rust }} - uses: Swatinem/rust-cache@v2 + + - name: Install system dependencies (Ubuntu) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y libssl-dev pkg-config + - run: cargo build --locked - run: cargo test --locked @@ -42,7 +52,13 @@ jobs: with: components: clippy - uses: Swatinem/rust-cache@v2 - - run: cargo clippy --all-targets -- -D warnings + + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install -y libssl-dev pkg-config + + - run: cargo clippy --all-targets --all-features -- -D warnings fmt: name: Formatting @@ -61,6 +77,12 @@ jobs: - uses: actions/checkout@v6 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - - run: cargo doc --no-deps --document-private-items + + - name: Install system dependencies + run: | + sudo apt-get update + sudo apt-get install -y libssl-dev pkg-config + + - run: cargo doc --no-deps --document-private-items --all-features env: RUSTDOCFLAGS: "-Dwarnings" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3022bd4..4cd234d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,11 +41,15 @@ jobs: with: targets: ${{ matrix.target }} - - name: Install cross-compilation tools - if: matrix.target == 'aarch64-unknown-linux-gnu' + - name: Install system dependencies (Linux) + if: runner.os == 'Linux' run: | sudo apt-get update - sudo apt-get install -y gcc-aarch64-linux-gnu + sudo apt-get install -y libssl-dev pkg-config + + - name: Install cross-compilation tools + if: matrix.target == 'aarch64-unknown-linux-gnu' + run: sudo apt-get install -y gcc-aarch64-linux-gnu - name: Install musl tools if: matrix.target == 'x86_64-unknown-linux-musl' diff --git a/CHANGELOG.md b/CHANGELOG.md index 4edddfb..7f5db92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/). ## [Unreleased] +## [0.2.0] - 2026-04-06 + +### Added + +- `.dbdiff.yml` configuration file with table/column ignore patterns +- `--config ` CLI flag (defaults to `.dbdiff.yml`) +- MySQL/MariaDB schema introspection via `information_schema` +- SQLite schema introspection via `PRAGMA` commands +- Cargo feature flags: `postgres`, `mysql`, `sqlite` (all enabled by default) +- Column ignore patterns: `*.column`, `table.*`, `table.column` + +### Changed + +- Database backends are now optional via feature flags +- `tokio-postgres` is now an optional dependency (feature `postgres`) + ## [0.1.0] - 2024-04-06 ### Added @@ -24,5 +40,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/). - Locking warnings for dangerous ALTER operations - `.dbdiff.yml` configuration file support (ignore tables/columns) -[Unreleased]: https://github.com/rekurt/dbdiff/compare/v0.1.0...HEAD +[Unreleased]: https://github.com/rekurt/dbdiff/compare/v0.2.0...HEAD +[0.2.0]: https://github.com/rekurt/dbdiff/compare/v0.1.0...v0.2.0 [0.1.0]: https://github.com/rekurt/dbdiff/releases/tag/v0.1.0 diff --git a/Cargo.lock b/Cargo.lock index 1702082..64d8345 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,35 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.17", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.4" @@ -11,6 +40,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "anstream" version = "1.0.0" @@ -47,7 +82,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -58,7 +93,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -67,6 +102,12 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + [[package]] name = "assert_cmd" version = "2.2.0" @@ -90,7 +131,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -99,18 +140,76 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "bigdecimal" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695" +dependencies = [ + "autocfg", + "libm", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "bindgen" +version = "0.72.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "itertools", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.117", +] + [[package]] name = "bitflags" version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[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 = "block-buffer" version = "0.12.0" @@ -120,6 +219,30 @@ dependencies = [ "hybrid-array", ] +[[package]] +name = "borsh" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a" +dependencies = [ + "borsh-derive", + "bytes", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfcfdc083699101d5a7965e49925975f2f55060f94f9a05e7187be95d530ca59" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "bstr" version = "1.12.1" @@ -131,12 +254,43 @@ dependencies = [ "serde", ] +[[package]] +name = "btoi" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" +dependencies = [ + "num-traits", +] + [[package]] name = "bumpalo" version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -149,12 +303,39 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +[[package]] +name = "cc" +version = "1.2.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" +dependencies = [ + "find-msvc-tools", + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + [[package]] name = "cfg-if" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chacha20" version = "0.10.0" @@ -162,8 +343,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" dependencies = [ "cfg-if", - "cpufeatures", - "rand_core", + "cpufeatures 0.3.0", + "rand_core 0.10.0", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", ] [[package]] @@ -197,7 +389,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -206,6 +398,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + [[package]] name = "cmov" version = "0.5.3" @@ -224,7 +425,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -233,6 +434,31 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + [[package]] name = "cpufeatures" version = "0.3.0" @@ -242,6 +468,81 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-common" version = "0.2.1" @@ -260,15 +561,52 @@ dependencies = [ "cmov", ] +[[package]] +name = "darling" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.117", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.117", +] + [[package]] name = "dbdiff" -version = "0.1.0" +version = "0.2.0" dependencies = [ "assert_cmd", "clap", "colored", + "mysql_async", "predicates", "regex", + "rusqlite", "serde", "serde_json", "serde_yaml", @@ -277,24 +615,60 @@ dependencies = [ "tokio-postgres", ] +[[package]] +name = "deranged" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" +dependencies = [ + "powerfmt", +] + [[package]] name = "difflib" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common 0.1.7", +] + [[package]] name = "digest" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" dependencies = [ - "block-buffer", + "block-buffer 0.12.0", "const-oid", - "crypto-common", + "crypto-common 0.2.1", "ctutils", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + [[package]] name = "equivalent" version = "1.0.2" @@ -308,7 +682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -317,12 +691,41 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + [[package]] name = "fastrand" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a043dc74da1e37d6afe657061213aa6f425f855399a11d3463c6ecccc4dfda1f" +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + +[[package]] +name = "flate2" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +dependencies = [ + "crc32fast", + "libz-sys", + "miniz_oxide", +] + [[package]] name = "float-cmp" version = "0.10.0" @@ -332,6 +735,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "foldhash" version = "0.1.5" @@ -339,43 +748,175 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] -name = "futures-channel" -version = "0.3.32" +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "futures-core", - "futures-sink", + "foreign-types-shared", ] [[package]] -name = "futures-core" -version = "0.3.32" +name = "foreign-types-shared" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "futures-sink" -version = "0.3.32" +name = "form_urlencoded" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] [[package]] -name = "futures-task" -version = "0.3.32" +name = "frunk" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" +checksum = "28aef0f9aa070bce60767c12ba9cb41efeaf1a2bc6427f87b7d83f11239a16d7" +dependencies = [ + "frunk_core", + "frunk_derives", + "frunk_proc_macros", + "serde", +] [[package]] -name = "futures-util" -version = "0.3.32" +name = "frunk_core" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "476eeaa382e3462b84da5d6ba3da97b5786823c2d0d3a0d04ef088d073da225c" +dependencies = [ + "serde", +] + +[[package]] +name = "frunk_derives" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0b4095fc99e1d858e5b8c7125d2638372ec85aa0fe6c807105cf10b0265ca6c" +dependencies = [ + "frunk_proc_macro_helpers", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "frunk_proc_macro_helpers" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1952b802269f2db12ab7c0bd328d0ae8feaabf19f352a7b0af7bb0c5693abfce" +dependencies = [ + "frunk_core", + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "frunk_proc_macros" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3462f590fa236005bd7ca4847f81438bd6fe0febd4d04e11968d4c2e96437e78" +dependencies = [ + "frunk_core", + "frunk_proc_macro_helpers", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures-channel" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" + +[[package]] +name = "futures-macro" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "futures-sink" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" + +[[package]] +name = "futures-task" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" + +[[package]] +name = "futures-util" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", + "futures-macro", "futures-sink", "futures-task", "pin-project-lite", + "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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi 5.3.0", + "wasip2", ] [[package]] @@ -386,18 +927,44 @@ checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "libc", - "r-efi", - "rand_core", + "r-efi 6.0.0", + "rand_core 0.10.0", "wasip2", "wasip3", ] +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.12", +] + [[package]] name = "hashbrown" version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ + "allocator-api2", + "equivalent", "foldhash", ] @@ -407,6 +974,15 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "heck" version = "0.5.0" @@ -419,7 +995,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" dependencies = [ - "digest", + "digest 0.11.2", ] [[package]] @@ -431,12 +1007,121 @@ dependencies = [ "typenum", ] +[[package]] +name = "icu_collections" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +dependencies = [ + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" + +[[package]] +name = "icu_properties" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" + +[[package]] +name = "icu_provider" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + [[package]] name = "id-arena" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + [[package]] name = "indexmap" version = "2.13.1" @@ -455,12 +1140,31 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + [[package]] name = "js-sys" version = "0.3.94" @@ -471,6 +1175,21 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "keyed_priority_queue" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" +dependencies = [ + "indexmap", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + [[package]] name = "leb128fmt" version = "0.1.0" @@ -483,6 +1202,22 @@ version = "0.2.184" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" +[[package]] +name = "libloading" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +dependencies = [ + "cfg-if", + "windows-link", +] + +[[package]] +name = "libm" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" + [[package]] name = "libredox" version = "0.1.15" @@ -492,12 +1227,40 @@ dependencies = [ "libc", ] +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc3a226e576f50782b3305c5ccf458698f92798987f551c6a02efe8276721e22" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linux-raw-sys" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" +[[package]] +name = "litemap" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" + [[package]] name = "lock_api" version = "0.4.14" @@ -513,38 +1276,203 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.5", +] + [[package]] name = "md-5" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" +dependencies = [ + "cfg-if", + "digest 0.11.2", +] + +[[package]] +name = "memchr" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +dependencies = [ + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.61.2", +] + +[[package]] +name = "mysql-common-derive" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63c3512cf11487168e0e9db7157801bf5273be13055a9cc95356dc9e0035e49c" +dependencies = [ + "darling", + "heck", + "num-bigint", + "proc-macro-crate", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.117", + "termcolor", + "thiserror", +] + +[[package]] +name = "mysql_async" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0b66e411c31265e879d9814d03721f2daa7ad07337b6308cb4bb0cde7e6fd47" +dependencies = [ + "bytes", + "crossbeam", + "flate2", + "futures-core", + "futures-sink", + "futures-util", + "keyed_priority_queue", + "lru", + "mysql_common", + "native-tls", + "pem", + "percent-encoding", + "pin-project", + "rand 0.8.5", + "serde", + "serde_json", + "socket2 0.5.10", + "thiserror", + "tokio", + "tokio-native-tls", + "tokio-util", + "twox-hash", + "url", +] + +[[package]] +name = "mysql_common" +version = "0.32.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478b0ff3f7d67b79da2b96f56f334431aef65e15ba4b29dd74a4236e29582bdc" +dependencies = [ + "base64 0.21.7", + "bigdecimal", + "bindgen", + "bitflags", + "bitvec", + "btoi", + "byteorder", + "bytes", + "cc", + "cmake", + "crc32fast", + "flate2", + "frunk", + "lazy_static", + "mysql-common-derive", + "num-bigint", + "num-traits", + "rand 0.8.5", + "regex", + "rust_decimal", + "saturating", + "serde", + "serde_json", + "sha1", + "sha2 0.10.9", + "smallvec", + "subprocess", + "thiserror", + "time", + "uuid", + "zstd", +] + +[[package]] +name = "native-tls" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "cfg-if", - "digest", + "memchr", + "minimal-lexical", ] [[package]] -name = "memchr" -version = "2.8.0" +name = "normalize-line-endings" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] -name = "mio" -version = "1.2.0" +name = "num-bigint" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys", + "num-integer", + "num-traits", ] [[package]] -name = "normalize-line-endings" -version = "0.3.0" +name = "num-conv" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] [[package]] name = "num-traits" @@ -585,6 +1513,50 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" +[[package]] +name = "openssl" +version = "0.10.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "openssl-probe" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + +[[package]] +name = "openssl-sys" +version = "0.9.112" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "parking_lot" version = "0.12.5" @@ -608,6 +1580,16 @@ dependencies = [ "windows-link", ] +[[package]] +name = "pem" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" +dependencies = [ + "base64 0.22.1", + "serde_core", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -633,27 +1615,53 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "pin-project-lite" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + [[package]] name = "postgres-protocol" version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56201207dac53e2f38e848e31b4b91616a6bb6e0c7205b77718994a7f49e70fc" dependencies = [ - "base64", + "base64 0.22.1", "byteorder", "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "hmac", "md-5", "memchr", - "rand", - "sha2", + "rand 0.10.0", + "sha2 0.11.0", "stringprep", ] @@ -664,10 +1672,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dc729a129e682e8d24170cd30ae1aa01b336b096cbb56df6d534ffec133d186" dependencies = [ "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "postgres-protocol", ] +[[package]] +name = "potential_utf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "predicates" version = "3.1.4" @@ -705,7 +1737,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn", + "syn 2.0.117", +] + +[[package]] +name = "proc-macro-crate" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.117", ] [[package]] @@ -717,6 +1780,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "quote" version = "1.0.45" @@ -726,12 +1809,35 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "r-efi" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[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 0.6.4", +] + [[package]] name = "rand" version = "0.10.0" @@ -739,8 +1845,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" dependencies = [ "chacha20", - "getrandom", - "rand_core", + "getrandom 0.4.2", + "rand_core 0.10.0", +] + +[[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 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", ] [[package]] @@ -787,6 +1912,81 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "rkyv" +version = "0.7.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags", + "fallible-iterator 0.3.0", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust_decimal" +version = "1.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ce901f9a19d251159075a4c37af514c3b8ef99c22e02dd8c19161cf397ee94a" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", + "wasm-bindgen", +] + +[[package]] +name = "rustc-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" + [[package]] name = "rustix" version = "1.1.4" @@ -797,7 +1997,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -812,12 +2012,56 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +[[package]] +name = "saturating" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" + +[[package]] +name = "schannel" +version = "0.1.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "1.0.28" @@ -851,7 +2095,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", ] [[package]] @@ -880,6 +2124,28 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.11.0" @@ -887,31 +2153,77 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.3.0", + "digest 0.11.2", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "simd-adler32" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "siphasher" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" + [[package]] name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "socket2" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" -dependencies = [ - "libc", - "windows-sys", -] +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stringprep" @@ -930,6 +2242,27 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subprocess" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c56e8662b206b9892d7a5a3f2ecdbcb455d3d6b259111373b7e08b8055158a8" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.117" @@ -941,6 +2274,23 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tempfile" version = "3.27.0" @@ -948,10 +2298,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom", + "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys", + "windows-sys 0.61.2", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", ] [[package]] @@ -960,6 +2319,65 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "time" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" + +[[package]] +name = "time-macros" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinystr" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.11.0" @@ -985,9 +2403,9 @@ dependencies = [ "libc", "mio", "pin-project-lite", - "socket2", + "socket2 0.6.3", "tokio-macros", - "windows-sys", + "windows-sys 0.61.2", ] [[package]] @@ -998,7 +2416,17 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.117", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", ] [[package]] @@ -1010,7 +2438,7 @@ dependencies = [ "async-trait", "byteorder", "bytes", - "fallible-iterator", + "fallible-iterator 0.2.0", "futures-channel", "futures-util", "log", @@ -1020,8 +2448,8 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "rand", - "socket2", + "rand 0.10.0", + "socket2 0.6.3", "tokio", "tokio-util", "whoami", @@ -1040,6 +2468,47 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml_datetime" +version = "1.1.1+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.25.10+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b" +dependencies = [ + "indexmap", + "toml_datetime", + "toml_parser", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.1.2+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" +dependencies = [ + "winnow", +] + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand 0.8.5", + "static_assertions", +] + [[package]] name = "typenum" version = "1.19.0" @@ -1085,12 +2554,52 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" +[[package]] +name = "url" +version = "2.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "uuid" +version = "1.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + [[package]] name = "wait-timeout" version = "0.2.1" @@ -1151,6 +2660,7 @@ dependencies = [ "cfg-if", "once_cell", "rustversion", + "serde", "wasm-bindgen-macro", "wasm-bindgen-shared", ] @@ -1174,7 +2684,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn", + "syn 2.0.117", "wasm-bindgen-shared", ] @@ -1244,12 +2754,52 @@ dependencies = [ "web-sys", ] +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -1259,6 +2809,79 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +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 = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +dependencies = [ + "memchr", +] + [[package]] name = "wit-bindgen" version = "0.51.0" @@ -1289,7 +2912,7 @@ dependencies = [ "heck", "indexmap", "prettyplease", - "syn", + "syn 2.0.117", "wasm-metadata", "wit-bindgen-core", "wit-component", @@ -1305,7 +2928,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn", + "syn 2.0.117", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -1347,8 +2970,148 @@ dependencies = [ "wasmparser", ] +[[package]] +name = "writeable" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "yoke" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "zerofrom" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "zmij" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" + +[[package]] +name = "zstd" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.16+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/Cargo.toml b/Cargo.toml index f3efce2..e3d7df9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dbdiff" -version = "0.1.0" +version = "0.2.0" edition = "2021" rust-version = "1.75" authors = ["rekurt"] @@ -25,10 +25,18 @@ exclude = [ name = "dbdiff" path = "src/main.rs" +[features] +default = ["postgres", "mysql", "sqlite"] +postgres = ["dep:tokio-postgres"] +mysql = ["dep:mysql_async"] +sqlite = ["dep:rusqlite"] + [dependencies] clap = { version = "4", features = ["derive"] } tokio = { version = "1", features = ["rt-multi-thread", "macros"] } -tokio-postgres = "0.7" +tokio-postgres = { version = "0.7", optional = true } +mysql_async = { version = "0.34", optional = true } +rusqlite = { version = "0.31", features = ["bundled"], optional = true } colored = "3" regex = "1" serde = { version = "1", features = ["derive"] } diff --git a/README.md b/README.md index dec6c6d..f882402 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,18 @@ dbdiff postgres://user:pass@prod-host/myapp --schema ./schema.sql Useful during code review — verify that a migration file actually matches what's in production. +### Compare MySQL databases + +```bash +dbdiff mysql://user:pass@prod-host/myapp mysql://user:pass@staging-host/myapp +``` + +### Compare a SQLite database against a schema file + +```bash +dbdiff myapp.db --schema ./schema.sql +``` + ### Save the generated migration to a file ```bash @@ -98,6 +110,12 @@ dbdiff postgres://prod/myapp postgres://staging/myapp --ci Returns exit code `0` if schemas match, `1` if they differ. Use this in GitHub Actions, GitLab CI, or any pipeline. +### Use a custom config file + +```bash +dbdiff postgres://prod/myapp postgres://staging/myapp --config ./my-config.yml +``` + ### JSON output for custom tooling ```bash @@ -184,8 +202,24 @@ output: | Database | Status | Version | |-----------------|-----------|---------| | PostgreSQL | ✅ stable | 12+ | -| MySQL / MariaDB | 🚧 v0.2 | 8.0+ | -| SQLite | 🗓 v0.3 | 3.x | +| MySQL / MariaDB | ✅ stable | 8.0+ | +| SQLite | ✅ stable | 3.x | + +--- + +## Feature flags + +Database backends are optional and can be toggled via Cargo features: + +```bash +# Install with only PostgreSQL support +cargo install dbdiff --no-default-features --features postgres + +# Install with PostgreSQL and SQLite only +cargo install dbdiff --no-default-features --features postgres,sqlite +``` + +All backends (`postgres`, `mysql`, `sqlite`) are enabled by default. --- @@ -219,13 +253,19 @@ src/ diff.rs Schema comparison engine migration.rs SQL migration generator output.rs Terminal rendering (colored diff) + config/ + mod.rs Config file parsing (.dbdiff.yml) + filter.rs Schema filtering (ignore tables/columns) loader/ mod.rs Source dispatch logic postgres.rs PostgreSQL introspection + mysql.rs MySQL / MariaDB introspection + sqlite.rs SQLite introspection sqlfile.rs .sql file parser tests/ cli.rs Integration tests - fixtures/ SQL test schemas + config.rs Config integration tests + fixtures/ SQL test schemas + config fixtures ``` --- diff --git a/src/cli.rs b/src/cli.rs index 53ea931..321da98 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -32,9 +32,13 @@ pub struct Args { #[arg(long)] pub dry_run: bool, - /// Output format - #[arg(long, value_enum, default_value = "pretty")] - pub format: OutputFormat, + /// Output format (overrides config file setting) + #[arg(long, value_enum)] + pub format: Option, + + /// Path to config file + #[arg(long, value_name = "FILE", default_value = ".dbdiff.yml")] + pub config: String, } #[derive(Debug, Clone, clap::ValueEnum)] @@ -55,4 +59,20 @@ impl Args { Err("Either a target DSN or --schema is required") } } + + /// Resolve the output format: CLI flag > config file > default (pretty). + pub fn resolve_format(&self, config_format: &Option) -> OutputFormat { + if let Some(ref fmt) = self.format { + return fmt.clone(); + } + if let Some(ref fmt) = config_format { + match fmt.to_lowercase().as_str() { + "json" => OutputFormat::Json, + "sql" => OutputFormat::Sql, + _ => OutputFormat::Pretty, + } + } else { + OutputFormat::Pretty + } + } } diff --git a/src/config/filter.rs b/src/config/filter.rs new file mode 100644 index 0000000..0d25e07 --- /dev/null +++ b/src/config/filter.rs @@ -0,0 +1,236 @@ +use crate::config::IgnoreConfig; +use crate::model::Schema; + +/// Remove ignored tables and columns from a schema based on ignore rules. +pub fn apply_ignore(schema: &mut Schema, ignore: &IgnoreConfig) { + // Remove ignored tables + for table_name in &ignore.tables { + schema.tables.remove(table_name); + } + + // Remove ignored columns + if !ignore.columns.is_empty() { + let table_names: Vec = schema.tables.keys().cloned().collect(); + for table_name in &table_names { + let table = schema.tables.get_mut(table_name).unwrap(); + let col_names: Vec = table.columns.keys().cloned().collect(); + let mut removed_columns: Vec = Vec::new(); + + for col_name in &col_names { + if ignore + .columns + .iter() + .any(|pattern| matches_column_pattern(table_name, col_name, pattern)) + { + table.columns.remove(col_name); + removed_columns.push(col_name.clone()); + } + } + + if !removed_columns.is_empty() { + table.indexes.retain(|_, index| { + !index + .columns + .iter() + .any(|index_col| removed_columns.iter().any(|removed| removed == index_col)) + }); + } + } + } +} + +/// Match a column against a pattern. +/// +/// Supported patterns: +/// - `*.column_name` — matches column in all tables +/// - `table_name.*` — matches all columns in a specific table +/// - `table_name.column_name` — matches exact table.column pair +fn matches_column_pattern(table: &str, column: &str, pattern: &str) -> bool { + let Some((pat_table, pat_column)) = pattern.split_once('.') else { + return false; + }; + + let table_matches = pat_table == "*" || pat_table == table; + let column_matches = pat_column == "*" || pat_column == column; + + table_matches && column_matches +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::model::{Column, Index, Table}; + + fn make_column(name: &str) -> Column { + Column { + name: name.to_string(), + data_type: "text".to_string(), + is_nullable: true, + default: None, + } + } + + fn make_index(table: &str, name: &str, columns: Vec<&str>) -> Index { + Index { + name: name.to_string(), + table_name: table.to_string(), + columns: columns + .into_iter() + .map(std::string::ToString::to_string) + .collect(), + is_unique: false, + } + } + + #[test] + fn wildcard_column_matches_all_tables() { + assert!(matches_column_pattern( + "users", + "created_at", + "*.created_at" + )); + assert!(matches_column_pattern( + "orders", + "created_at", + "*.created_at" + )); + assert!(!matches_column_pattern("users", "email", "*.created_at")); + } + + #[test] + fn wildcard_table_matches_all_columns() { + assert!(matches_column_pattern("sessions", "token", "sessions.*")); + assert!(matches_column_pattern( + "sessions", + "expires_at", + "sessions.*" + )); + assert!(!matches_column_pattern("users", "email", "sessions.*")); + } + + #[test] + fn exact_match() { + assert!(matches_column_pattern( + "users", + "password_hash", + "users.password_hash" + )); + assert!(!matches_column_pattern( + "orders", + "password_hash", + "users.password_hash" + )); + } + + #[test] + fn invalid_pattern_no_dot() { + assert!(!matches_column_pattern("users", "email", "no_dot_pattern")); + } + + #[test] + fn apply_ignore_removes_tables() { + let mut schema = Schema::new(); + let mut t = Table::new("users"); + t.columns.insert("id".into(), make_column("id")); + schema.tables.insert("users".into(), t); + + let mut t = Table::new("_migrations"); + t.columns.insert("id".into(), make_column("id")); + schema.tables.insert("_migrations".into(), t); + + let ignore = IgnoreConfig { + tables: vec!["_migrations".into()], + columns: vec![], + }; + + apply_ignore(&mut schema, &ignore); + assert_eq!(schema.tables.len(), 1); + assert!(schema.tables.contains_key("users")); + assert!(!schema.tables.contains_key("_migrations")); + } + + #[test] + fn apply_ignore_removes_columns() { + let mut schema = Schema::new(); + let mut t = Table::new("users"); + t.columns.insert("id".into(), make_column("id")); + t.columns + .insert("created_at".into(), make_column("created_at")); + t.columns.insert("email".into(), make_column("email")); + schema.tables.insert("users".into(), t); + + let mut t = Table::new("orders"); + t.columns.insert("id".into(), make_column("id")); + t.columns + .insert("created_at".into(), make_column("created_at")); + schema.tables.insert("orders".into(), t); + + let ignore = IgnoreConfig { + tables: vec![], + columns: vec!["*.created_at".into()], + }; + + apply_ignore(&mut schema, &ignore); + assert_eq!(schema.tables["users"].columns.len(), 2); // id, email + assert!(!schema.tables["users"].columns.contains_key("created_at")); + assert_eq!(schema.tables["orders"].columns.len(), 1); // id + assert!(!schema.tables["orders"].columns.contains_key("created_at")); + } + + #[test] + fn apply_ignore_table_wildcard_removes_all_columns() { + let mut schema = Schema::new(); + let mut t = Table::new("sessions"); + t.columns.insert("id".into(), make_column("id")); + t.columns.insert("token".into(), make_column("token")); + schema.tables.insert("sessions".into(), t); + + let ignore = IgnoreConfig { + tables: vec![], + columns: vec!["sessions.*".into()], + }; + + apply_ignore(&mut schema, &ignore); + assert!(schema.tables["sessions"].columns.is_empty()); + } + + #[test] + fn apply_ignore_removes_indexes_on_ignored_columns() { + let mut schema = Schema::new(); + let mut t = Table::new("users"); + t.columns.insert("id".into(), make_column("id")); + t.columns.insert("email".into(), make_column("email")); + t.columns + .insert("created_at".into(), make_column("created_at")); + t.indexes.insert( + "idx_users_email".into(), + make_index("users", "idx_users_email", vec!["email"]), + ); + t.indexes.insert( + "idx_users_created_at".into(), + make_index("users", "idx_users_created_at", vec!["created_at"]), + ); + t.indexes.insert( + "idx_users_email_created_at".into(), + make_index( + "users", + "idx_users_email_created_at", + vec!["email", "created_at"], + ), + ); + schema.tables.insert("users".into(), t); + + let ignore = IgnoreConfig { + tables: vec![], + columns: vec!["*.created_at".into()], + }; + + apply_ignore(&mut schema, &ignore); + + let users = &schema.tables["users"]; + assert!(!users.columns.contains_key("created_at")); + assert!(users.indexes.contains_key("idx_users_email")); + assert!(!users.indexes.contains_key("idx_users_created_at")); + assert!(!users.indexes.contains_key("idx_users_email_created_at")); + } +} diff --git a/src/config/mod.rs b/src/config/mod.rs new file mode 100644 index 0000000..ba1d817 --- /dev/null +++ b/src/config/mod.rs @@ -0,0 +1,111 @@ +pub mod filter; + +use std::path::Path; + +use serde::Deserialize; + +use crate::error::DbDiffError; + +/// Top-level configuration loaded from `.dbdiff.yml`. +#[derive(Debug, Clone, Default, Deserialize)] +#[serde(default)] +pub struct Config { + pub ignore: IgnoreConfig, + pub output: OutputConfig, +} + +/// Rules for ignoring tables and columns during comparison. +#[derive(Debug, Clone, Default, Deserialize)] +#[serde(default)] +pub struct IgnoreConfig { + /// Exact table names to ignore (e.g. `_migrations`, `schema_version`). + pub tables: Vec, + /// Column patterns to ignore: + /// - `*.column_name` — ignore column in all tables + /// - `table_name.*` — ignore all columns in a specific table + /// - `table_name.column_name` — ignore exact table.column pair + pub columns: Vec, +} + +/// Default output settings (CLI args override these). +#[derive(Debug, Clone, Default, Deserialize)] +#[serde(default)] +pub struct OutputConfig { + /// Output format: `pretty`, `json`, or `sql`. + pub format: Option, + /// Whether to use colored output. + pub color: Option, +} + +/// Load configuration from a YAML file. +/// +/// Returns `Config::default()` if the file does not exist. +/// Returns an error only if the file exists but cannot be parsed. +pub fn load_config(path: &str) -> Result { + let path = Path::new(path); + + if !path.exists() { + return Ok(Config::default()); + } + + let contents = std::fs::read_to_string(path)?; + let config: Config = serde_yaml::from_str(&contents) + .map_err(|e| DbDiffError::InvalidArg(format!("Failed to parse config file: {e}")))?; + + Ok(config) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn parse_full_config() { + let yaml = r#" +ignore: + tables: + - _migrations + - schema_version + columns: + - "*.created_at" + - "sessions.*" +output: + format: json + color: false +"#; + let config: Config = serde_yaml::from_str(yaml).unwrap(); + assert_eq!(config.ignore.tables, vec!["_migrations", "schema_version"]); + assert_eq!(config.ignore.columns, vec!["*.created_at", "sessions.*"]); + assert_eq!(config.output.format.as_deref(), Some("json")); + assert_eq!(config.output.color, Some(false)); + } + + #[test] + fn parse_empty_config() { + let yaml = ""; + let config: Config = serde_yaml::from_str(yaml).unwrap(); + assert!(config.ignore.tables.is_empty()); + assert!(config.ignore.columns.is_empty()); + assert_eq!(config.output.format, None); + assert_eq!(config.output.color, None); + } + + #[test] + fn parse_partial_config() { + let yaml = r#" +ignore: + tables: + - _migrations +"#; + let config: Config = serde_yaml::from_str(yaml).unwrap(); + assert_eq!(config.ignore.tables, vec!["_migrations"]); + assert!(config.ignore.columns.is_empty()); + assert_eq!(config.output.format, None); + } + + #[test] + fn missing_file_returns_default() { + let config = load_config("/nonexistent/path/.dbdiff.yml").unwrap(); + assert!(config.ignore.tables.is_empty()); + } +} diff --git a/src/error.rs b/src/error.rs index 95174b5..4afd0bf 100644 --- a/src/error.rs +++ b/src/error.rs @@ -3,7 +3,12 @@ use std::fmt; /// All error types that can occur in dbdiff. #[derive(Debug)] pub enum DbDiffError { + #[cfg(feature = "postgres")] Postgres(tokio_postgres::Error), + #[cfg(feature = "mysql")] + MySQL(mysql_async::Error), + #[cfg(feature = "sqlite")] + Sqlite(rusqlite::Error), Io(std::io::Error), SqlParse(String), InvalidArg(String), @@ -12,7 +17,12 @@ pub enum DbDiffError { impl fmt::Display for DbDiffError { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { + #[cfg(feature = "postgres")] Self::Postgres(e) => write!(f, "PostgreSQL error: {e}"), + #[cfg(feature = "mysql")] + Self::MySQL(e) => write!(f, "MySQL error: {e}"), + #[cfg(feature = "sqlite")] + Self::Sqlite(e) => write!(f, "SQLite error: {e}"), Self::Io(e) => write!(f, "I/O error: {e}"), Self::SqlParse(msg) => write!(f, "SQL parse error: {msg}"), Self::InvalidArg(msg) => write!(f, "Invalid argument: {msg}"), @@ -23,19 +33,39 @@ impl fmt::Display for DbDiffError { impl std::error::Error for DbDiffError { fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { match self { + #[cfg(feature = "postgres")] Self::Postgres(e) => Some(e), + #[cfg(feature = "mysql")] + Self::MySQL(e) => Some(e), + #[cfg(feature = "sqlite")] + Self::Sqlite(e) => Some(e), Self::Io(e) => Some(e), Self::SqlParse(_) | Self::InvalidArg(_) => None, } } } +#[cfg(feature = "postgres")] impl From for DbDiffError { fn from(e: tokio_postgres::Error) -> Self { Self::Postgres(e) } } +#[cfg(feature = "mysql")] +impl From for DbDiffError { + fn from(e: mysql_async::Error) -> Self { + Self::MySQL(e) + } +} + +#[cfg(feature = "sqlite")] +impl From for DbDiffError { + fn from(e: rusqlite::Error) -> Self { + Self::Sqlite(e) + } +} + impl From for DbDiffError { fn from(e: std::io::Error) -> Self { Self::Io(e) diff --git a/src/lib.rs b/src/lib.rs index bb6ec12..9e2fb28 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,5 @@ pub mod cli; +pub mod config; pub mod diff; pub mod error; pub mod loader; diff --git a/src/loader/mod.rs b/src/loader/mod.rs index 001f204..358fc77 100644 --- a/src/loader/mod.rs +++ b/src/loader/mod.rs @@ -1,23 +1,81 @@ +#[cfg(feature = "mysql")] +pub mod mysql; +#[cfg(feature = "postgres")] pub mod postgres; pub mod sqlfile; +#[cfg(feature = "sqlite")] +pub mod sqlite; use crate::error::DbDiffError; use crate::model::Schema; +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum SqlDialect { + Postgres, + MySql, + Sqlite, + SqlFile, +} + +#[derive(Debug, Clone)] +pub struct LoadedSchema { + pub schema: Schema, + pub dialect: SqlDialect, +} + /// Load a schema from a source string. /// /// Dispatches to the appropriate loader based on the source format: /// - `postgres://...` or `postgresql://...` → live PostgreSQL connection -/// - File path ending in `.sql` or existing file → SQL file parser -pub async fn load_schema(source: &str) -> Result { +/// - `mysql://...` or `mariadb://...` → live MySQL/MariaDB connection +/// - `.db`, `.sqlite`, `.sqlite3`, or `sqlite://...` → SQLite database file +/// - `.sql` file path → SQL file parser +pub async fn load_schema(source: &str) -> Result { + #[cfg(feature = "postgres")] if source.starts_with("postgres://") || source.starts_with("postgresql://") { - postgres::load(source).await - } else if source.ends_with(".sql") || std::path::Path::new(source).exists() { - sqlfile::load_file(source) - } else { - Err(DbDiffError::InvalidArg(format!( - "Cannot determine source type for '{source}'. \ - Expected a PostgreSQL DSN (postgres://...) or a .sql file path." - ))) + return postgres::load(source).await.map(|schema| LoadedSchema { + schema, + dialect: SqlDialect::Postgres, + }); } + + #[cfg(feature = "mysql")] + if source.starts_with("mysql://") || source.starts_with("mariadb://") { + return mysql::load(source).await.map(|schema| LoadedSchema { + schema, + dialect: SqlDialect::MySql, + }); + } + + #[cfg(feature = "sqlite")] + if is_sqlite_source(source) { + let source = source.to_string(); + let schema = tokio::task::spawn_blocking(move || sqlite::load(&source)) + .await + .map_err(|e| DbDiffError::InvalidArg(e.to_string()))?; + return Ok(LoadedSchema { + schema, + dialect: SqlDialect::Sqlite, + }); + } + + if source.ends_with(".sql") || std::path::Path::new(source).exists() { + return sqlfile::load_file(source).map(|schema| LoadedSchema { + schema, + dialect: SqlDialect::SqlFile, + }); + } + + Err(DbDiffError::InvalidArg(format!( + "Cannot determine source type for '{source}'. \ + Expected a database DSN (postgres://, mysql://, sqlite://) or a .sql file path." + ))) +} + +#[cfg(feature = "sqlite")] +fn is_sqlite_source(source: &str) -> bool { + source.starts_with("sqlite://") + || source.ends_with(".db") + || source.ends_with(".sqlite") + || source.ends_with(".sqlite3") } diff --git a/src/loader/mysql.rs b/src/loader/mysql.rs new file mode 100644 index 0000000..8ffe253 --- /dev/null +++ b/src/loader/mysql.rs @@ -0,0 +1,196 @@ +use mysql_async::prelude::*; +use mysql_async::{Opts, OptsBuilder}; +use std::collections::BTreeMap; + +use crate::error::DbDiffError; +use crate::model::{Column, Index, Schema, Table}; + +/// Load a schema from a live MySQL/MariaDB database via DSN. +pub async fn load(dsn: &str) -> Result { + let opts = Opts::from_url(dsn) + .map_err(|e| DbDiffError::InvalidArg(format!("Invalid MySQL DSN: {e}")))?; + let db_name = opts + .db_name() + .ok_or_else(|| DbDiffError::InvalidArg("MySQL DSN must include a database name".into()))? + .to_string(); + + let pool = mysql_async::Pool::new(OptsBuilder::from_opts(opts.clone())); + let mut conn = pool.get_conn().await?; + + let mut schema = Schema::new(); + + // Load columns from information_schema + let rows: Vec<(String, String, String, String, Option)> = conn + .exec( + "SELECT table_name, column_name, column_type, is_nullable, column_default \ + FROM information_schema.columns \ + WHERE table_schema = :db \ + AND table_name IN ( \ + SELECT table_name \ + FROM information_schema.tables \ + WHERE table_schema = :db \ + AND table_type = 'BASE TABLE' \ + ) \ + ORDER BY table_name, ordinal_position", + mysql_async::params! { "db" => &db_name }, + ) + .await?; + + for (table_name, column_name, column_type, is_nullable, column_default) in &rows { + let column = Column { + name: column_name.clone(), + data_type: normalize_type(column_type), + is_nullable: is_nullable == "YES", + default: column_default.as_ref().map(|d| normalize_default(d)), + }; + + schema + .tables + .entry(table_name.clone()) + .or_insert_with(|| Table::new(table_name)) + .columns + .insert(column_name.clone(), column); + } + + // Load indexes from information_schema.statistics + let idx_rows: Vec<(String, String, Option, i64)> = conn + .exec( + "SELECT table_name, index_name, column_name, non_unique \ + FROM information_schema.statistics \ + WHERE table_schema = :db \ + AND index_name != 'PRIMARY' \ + AND table_name IN ( \ + SELECT table_name \ + FROM information_schema.tables \ + WHERE table_schema = :db \ + AND table_type = 'BASE TABLE' \ + ) \ + ORDER BY table_name, index_name, seq_in_index", + mysql_async::params! { "db" => &db_name }, + ) + .await?; + + let index_map = group_index_rows(&idx_rows); + for ((table_name, index_name), (columns, is_unique)) in index_map { + if columns.is_empty() { + // Functional indexes can have NULL `column_name` in information_schema.statistics. + // Skip for now to avoid creating malformed empty-column indexes in downstream SQL. + continue; + } + + let index = Index { + name: index_name.clone(), + table_name: table_name.clone(), + columns, + is_unique, + }; + + if let Some(table) = schema.tables.get_mut(&table_name) { + table.indexes.insert(index_name, index); + } + } + + pool.disconnect().await?; + Ok(schema) +} + +fn group_index_rows( + idx_rows: &[(String, String, Option, i64)], +) -> BTreeMap<(String, String), (Vec, bool)> { + let mut index_map: BTreeMap<(String, String), (Vec, bool)> = BTreeMap::new(); + + for (table_name, index_name, column_name, non_unique) in idx_rows { + let entry = index_map + .entry((table_name.clone(), index_name.clone())) + .or_insert_with(|| (Vec::new(), *non_unique == 0)); + if let Some(column_name) = column_name { + entry.0.push(column_name.clone()); + } + } + + index_map +} + +/// Normalize MySQL column types. +/// +/// MySQL returns types like `int(11)`, `bigint(20)` — strip display widths from integer types +/// since they don't affect storage. Keep lengths for varchar, char, decimal, etc. +fn normalize_type(column_type: &str) -> String { + let lower = column_type.to_lowercase(); + + // Strip display width from integer types: int(11) -> int, bigint(20) -> bigint + if let Some(base) = lower.strip_suffix(")") { + if let Some(paren_pos) = base.rfind('(') { + let type_name = &base[..paren_pos]; + match type_name { + "tinyint" | "smallint" | "mediumint" | "int" | "bigint" => { + return type_name.to_string(); + } + _ => {} + } + } + } + + // Handle unsigned variants: int(11) unsigned -> int unsigned + if lower.contains(" unsigned") { + let without_unsigned = lower.replace(" unsigned", ""); + let normalized = normalize_type(&without_unsigned); + return format!("{normalized} unsigned"); + } + + lower +} + +/// Clean up MySQL default values. +fn normalize_default(default: &str) -> String { + // Preserve literal text exactly so downstream SQL rendering keeps valid quoting. + default.to_string() +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_normalize_type() { + assert_eq!(normalize_type("int(11)"), "int"); + assert_eq!(normalize_type("bigint(20)"), "bigint"); + assert_eq!(normalize_type("tinyint(1)"), "tinyint"); + assert_eq!(normalize_type("varchar(255)"), "varchar(255)"); + assert_eq!(normalize_type("decimal(10,2)"), "decimal(10,2)"); + assert_eq!(normalize_type("text"), "text"); + assert_eq!(normalize_type("int(11) unsigned"), "int unsigned"); + } + + #[test] + fn test_normalize_default() { + assert_eq!(normalize_default("0"), "0"); + assert_eq!(normalize_default("'hello'"), "'hello'"); + assert_eq!(normalize_default("CURRENT_TIMESTAMP"), "CURRENT_TIMESTAMP"); + assert_eq!(normalize_default("NULL"), "NULL"); + } + + #[test] + fn test_group_index_rows_handles_null_column_names() { + let rows = vec![ + ( + "users".to_string(), + "idx_users_email".to_string(), + Some("email".to_string()), + 0, + ), + ("users".to_string(), "idx_users_func".to_string(), None, 1), + ]; + + let grouped = group_index_rows(&rows); + + assert_eq!( + grouped.get(&(String::from("users"), String::from("idx_users_email"))), + Some(&(vec![String::from("email")], true)) + ); + assert_eq!( + grouped.get(&(String::from("users"), String::from("idx_users_func"))), + Some(&(Vec::new(), false)) + ); + } +} diff --git a/src/loader/sqlite.rs b/src/loader/sqlite.rs new file mode 100644 index 0000000..0e9fc98 --- /dev/null +++ b/src/loader/sqlite.rs @@ -0,0 +1,294 @@ +use rusqlite::Connection; +use std::path::Path; + +use crate::error::DbDiffError; +use crate::model::{Column, Index, Schema, Table}; + +/// Load a schema from a SQLite database file. +/// +/// Accepts paths like `mydb.db`, `mydb.sqlite`, `mydb.sqlite3`, or `sqlite://path`. +/// This is a synchronous function — call via `spawn_blocking` from async contexts. +pub fn load(source: &str) -> Result { + let path = source.strip_prefix("sqlite://").unwrap_or(source); + if !Path::new(path).exists() { + return Err(DbDiffError::InvalidArg(format!( + "SQLite source file does not exist: {path}" + ))); + } + let conn = Connection::open(path)?; + + let mut schema = Schema::new(); + + // Get all user tables (skip internal sqlite_ tables) + let table_names = get_table_names(&conn)?; + + for table_name in &table_names { + let mut table = Table::new(table_name); + + load_columns(&conn, table_name, &mut table)?; + load_indexes(&conn, table_name, &mut table)?; + + schema.tables.insert(table_name.clone(), table); + } + + Ok(schema) +} + +fn get_table_names(conn: &Connection) -> Result, DbDiffError> { + let mut stmt = conn.prepare( + "SELECT name FROM sqlite_master \ + WHERE type = 'table' AND name NOT LIKE 'sqlite_%' \ + ORDER BY name", + )?; + + let names = stmt + .query_map([], |row| row.get(0))? + .collect::, _>>()?; + + Ok(names) +} + +fn load_columns(conn: &Connection, table_name: &str, table: &mut Table) -> Result<(), DbDiffError> { + // PRAGMA table_info returns: cid, name, type, notnull, dflt_value, pk + let mut stmt = conn.prepare(&format!("PRAGMA table_info(\"{}\")", table_name))?; + + let columns = stmt.query_map([], |row| { + let name: String = row.get(1)?; + let data_type: String = row.get(2)?; + let notnull: bool = row.get(3)?; + let dflt_value: Option = row.get(4)?; + + Ok(Column { + name, + data_type: normalize_type(&data_type), + is_nullable: !notnull, + default: dflt_value.map(|d| normalize_default(&d)), + }) + })?; + + for col in columns { + let col = col?; + table.columns.insert(col.name.clone(), col); + } + + Ok(()) +} + +fn load_indexes(conn: &Connection, table_name: &str, table: &mut Table) -> Result<(), DbDiffError> { + // PRAGMA index_list returns: seq, name, unique, origin, partial + let mut stmt = conn.prepare(&format!("PRAGMA index_list(\"{}\")", table_name))?; + + let indexes: Vec<(String, bool, String)> = stmt + .query_map([], |row| { + let name: String = row.get(1)?; + let is_unique: bool = row.get(2)?; + let origin: String = row.get(3)?; + Ok((name, is_unique, origin)) + })? + .collect::>()?; + + for (index_name, is_unique, origin) in indexes { + // Skip auto-generated indexes for PRIMARY KEY / UNIQUE constraints. + // SQLite marks these with origin: + // - "pk": PRIMARY KEY + // - "u": UNIQUE constraint + // These are internal implementation details (often sqlite_autoindex_*), + // not user-managed indexes we should diff/migrate directly. + if matches!(origin.as_str(), "pk" | "u") { + continue; + } + + // PRAGMA index_info returns: seqno, cid, name + // For expression indexes, name is NULL — skip those columns + let mut col_stmt = conn.prepare(&format!("PRAGMA index_info(\"{}\")", index_name))?; + let columns: Vec = col_stmt + .query_map([], |row| row.get::<_, Option>(2))? + .filter_map(|r| r.ok().flatten()) + .collect(); + + if columns.is_empty() { + // Expression indexes report NULL column names via PRAGMA index_info. + // Skip these until expression terms are represented explicitly. + continue; + } + + let index = Index { + name: index_name.clone(), + table_name: table_name.to_string(), + columns, + is_unique, + }; + + table.indexes.insert(index_name, index); + } + + Ok(()) +} + +/// Normalize SQLite type names. +/// +/// SQLite has flexible typing. We normalize common aliases to canonical forms. +fn normalize_type(sqlite_type: &str) -> String { + let upper = sqlite_type.trim().to_uppercase(); + + match upper.as_str() { + "INT" | "INTEGER" => "integer".to_string(), + "TEXT" | "CLOB" => "text".to_string(), + "REAL" | "DOUBLE" | "DOUBLE PRECISION" | "FLOAT" => "real".to_string(), + "BLOB" => "blob".to_string(), + "BOOLEAN" | "BOOL" => "bool".to_string(), + "DATETIME" | "TIMESTAMP" => "datetime".to_string(), + "" => "blob".to_string(), // untyped columns default to blob affinity + _ => { + // Handle types with length: VARCHAR(255) -> varchar(255) + sqlite_type.to_lowercase() + } + } +} + +/// Clean up SQLite default values. +fn normalize_default(default: &str) -> String { + // Preserve literal text exactly so downstream SQL rendering keeps valid quoting. + default.to_string() +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_normalize_type() { + assert_eq!(normalize_type("INTEGER"), "integer"); + assert_eq!(normalize_type("INT"), "integer"); + assert_eq!(normalize_type("TEXT"), "text"); + assert_eq!(normalize_type("REAL"), "real"); + assert_eq!(normalize_type("BLOB"), "blob"); + assert_eq!(normalize_type("BOOLEAN"), "bool"); + assert_eq!(normalize_type("DATETIME"), "datetime"); + assert_eq!(normalize_type("VARCHAR(255)"), "varchar(255)"); + assert_eq!(normalize_type(""), "blob"); + } + + #[test] + fn test_normalize_default() { + assert_eq!(normalize_default("0"), "0"); + assert_eq!(normalize_default("'hello'"), "'hello'"); + assert_eq!(normalize_default("NULL"), "NULL"); + assert_eq!(normalize_default("CURRENT_TIMESTAMP"), "CURRENT_TIMESTAMP"); + } + + #[test] + fn load_fails_when_sqlite_file_is_missing() { + let missing_path = format!( + "/tmp/dbdiff-missing-{}-{}.sqlite", + std::process::id(), + std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap() + .as_nanos() + ); + + let err = load(&missing_path).unwrap_err(); + match err { + DbDiffError::InvalidArg(msg) => { + assert!(msg.contains("does not exist")); + assert!(msg.contains(&missing_path)); + } + other => panic!("expected InvalidArg, got {other:?}"), + } + } + + #[test] + fn load_sqlite_schema() { + let conn = Connection::open_in_memory().unwrap(); + conn.execute_batch( + "CREATE TABLE users ( + id INTEGER PRIMARY KEY NOT NULL, + email TEXT NOT NULL, + name VARCHAR(100), + active BOOLEAN DEFAULT 1 + ); + CREATE INDEX idx_users_email ON users(email); + CREATE TABLE orders ( + id INTEGER PRIMARY KEY NOT NULL, + user_id INTEGER NOT NULL, + total REAL NOT NULL DEFAULT 0.0 + ); + CREATE INDEX idx_orders_user_id ON orders(user_id);", + ) + .unwrap(); + + // Use the internal functions to test + let mut schema = Schema::new(); + let table_names = get_table_names(&conn).unwrap(); + assert_eq!(table_names, vec!["orders", "users"]); + + for name in &table_names { + let mut table = Table::new(name); + load_columns(&conn, name, &mut table).unwrap(); + load_indexes(&conn, name, &mut table).unwrap(); + schema.tables.insert(name.clone(), table); + } + + // Verify users table + let users = &schema.tables["users"]; + assert_eq!(users.columns.len(), 4); + assert_eq!(users.columns["id"].data_type, "integer"); + assert!(!users.columns["id"].is_nullable); + assert_eq!(users.columns["email"].data_type, "text"); + assert_eq!(users.columns["name"].data_type, "varchar(100)"); + assert_eq!(users.columns["active"].data_type, "bool"); + assert_eq!(users.columns["active"].default.as_deref(), Some("1")); + assert_eq!(users.indexes.len(), 1); + assert!(users.indexes.contains_key("idx_users_email")); + assert_eq!(users.indexes["idx_users_email"].columns, vec!["email"]); + + // Verify orders table + let orders = &schema.tables["orders"]; + assert_eq!(orders.columns.len(), 3); + assert_eq!(orders.indexes.len(), 1); + assert!(orders.indexes.contains_key("idx_orders_user_id")); + } + + #[test] + fn expression_indexes_are_skipped() { + let conn = Connection::open_in_memory().unwrap(); + conn.execute_batch( + "CREATE TABLE items ( + id INTEGER PRIMARY KEY NOT NULL, + name TEXT NOT NULL + ); + CREATE INDEX idx_items_lower_name ON items(lower(name));", + ) + .unwrap(); + + let mut table = Table::new("items"); + load_indexes(&conn, "items", &mut table).unwrap(); + + // Expression index is skipped to avoid producing empty-column SQL definitions. + assert!(!table.indexes.contains_key("idx_items_lower_name")); + } + + #[test] + fn unique_constraint_autoindexes_are_skipped() { + let conn = Connection::open_in_memory().unwrap(); + conn.execute_batch( + "CREATE TABLE users ( + id INTEGER PRIMARY KEY NOT NULL, + email TEXT NOT NULL UNIQUE + ); + CREATE INDEX idx_users_email ON users(email);", + ) + .unwrap(); + + let mut table = Table::new("users"); + load_indexes(&conn, "users", &mut table).unwrap(); + + assert!(table.indexes.contains_key("idx_users_email")); + assert_eq!(table.indexes.len(), 1); + assert!(!table + .indexes + .keys() + .any(|index_name| index_name.starts_with("sqlite_autoindex_"))); + } +} diff --git a/src/main.rs b/src/main.rs index da3e8d3..fef5b21 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,8 +3,10 @@ use std::process::ExitCode; use clap::Parser; use dbdiff::cli::{Args, OutputFormat}; +use dbdiff::config; use dbdiff::diff::diff_schemas; use dbdiff::loader; +use dbdiff::loader::SqlDialect; use dbdiff::migration::generate_migration; use dbdiff::output; @@ -25,7 +27,12 @@ async fn run(args: Args) -> Result<(), ExitCode> { ExitCode::from(2) })?; - let (left, right) = tokio::try_join!( + let cfg = config::load_config(&args.config).map_err(|e| { + eprintln!("Error: {e}"); + ExitCode::from(2) + })?; + + let (mut left, mut right) = tokio::try_join!( loader::load_schema(&args.source), loader::load_schema(target_source), ) @@ -34,10 +41,30 @@ async fn run(args: Args) -> Result<(), ExitCode> { ExitCode::from(2) })?; - let diff = diff_schemas(&left, &right); - let statements = generate_migration(&diff); + config::filter::apply_ignore(&mut left.schema, &cfg.ignore); + config::filter::apply_ignore(&mut right.schema, &cfg.ignore); + + // Apply config color setting (CLI could override later with --color flag) + if let Some(false) = cfg.output.color { + colored::control::set_override(false); + } + + let diff = diff_schemas(&left.schema, &right.schema); + let migration_dialect = match (left.dialect, right.dialect) { + (SqlDialect::SqlFile, other) | (other, SqlDialect::SqlFile) => other, + (l, r) if l == r => l, + (l, r) => { + eprintln!( + "Error: Cannot generate migration for mixed backends ({l:?} vs {r:?}). \ + Compare like-for-like backends or use a .sql file for one side." + ); + return Err(ExitCode::from(2)); + } + }; + let statements = generate_migration(&diff, migration_dialect); + let format = args.resolve_format(&cfg.output.format); - match args.format { + match format { OutputFormat::Pretty => { output::print_diff(&diff); if !statements.is_empty() { diff --git a/src/migration.rs b/src/migration.rs index b1030a8..d449a73 100644 --- a/src/migration.rs +++ b/src/migration.rs @@ -1,4 +1,5 @@ use crate::diff::{ColumnDiff, SchemaDiff, TableDiff}; +use crate::loader::SqlDialect; use crate::model::{Column, Index, Table}; /// Generate migration SQL statements from a schema diff. @@ -11,14 +12,14 @@ use crate::model::{Column, Index, Table}; /// 5. ADD COLUMNs /// 6. ALTER COLUMNs /// 7. CREATE INDEXes -pub fn generate_migration(diff: &SchemaDiff) -> Vec { +pub fn generate_migration(diff: &SchemaDiff, dialect: SqlDialect) -> Vec { let mut statements = Vec::new(); // Phase 1: DROP INDEXes from modified tables for table_diff in &diff.modified_tables { for idx in &table_diff.removed_indexes { statements.push(MigrationStatement { - sql: format!("DROP INDEX {};", idx.name), + sql: drop_index_sql(idx, dialect), warnings: Vec::new(), }); } @@ -91,7 +92,7 @@ pub fn generate_migration(diff: &SchemaDiff) -> Vec { // Phase 6: ALTER COLUMNs for table_diff in &diff.modified_tables { - let mut alter_stmts = generate_column_alterations(table_diff); + let mut alter_stmts = generate_column_alterations(table_diff, dialect); statements.append(&mut alter_stmts); } @@ -136,6 +137,13 @@ fn create_index_sql(idx: &Index) -> String { ) } +fn drop_index_sql(idx: &Index, dialect: SqlDialect) -> String { + match dialect { + SqlDialect::MySql => format!("DROP INDEX {} ON {};", idx.name, idx.table_name), + _ => format!("DROP INDEX {};", idx.name), + } +} + fn add_column_warnings(col: &Column) -> Vec { let mut warnings = Vec::new(); if !col.is_nullable && col.default.is_none() { @@ -155,7 +163,10 @@ fn add_column_warnings(col: &Column) -> Vec { warnings } -fn generate_column_alterations(table_diff: &TableDiff) -> Vec { +fn generate_column_alterations( + table_diff: &TableDiff, + dialect: SqlDialect, +) -> Vec { let mut stmts = Vec::new(); for col_diff in &table_diff.modified_columns { @@ -164,41 +175,98 @@ fn generate_column_alterations(table_diff: &TableDiff) -> Vec stmts.push(MigrationStatement { + sql: format!("ALTER TABLE {table} MODIFY COLUMN {};", new.definition()), + warnings: vec![format!( + "Changing column type from '{}' to '{}' may require a table rewrite \ + and table lock.", + old.data_type, new.data_type + )], + }), + SqlDialect::Sqlite => stmts.push(MigrationStatement { sql: format!( - "ALTER TABLE {table} ALTER COLUMN {} DROP NOT NULL;", + "-- manual migration required for type change on {table}.{}", new.name ), - warnings: Vec::new(), - }); - } else { - stmts.push(MigrationStatement { - sql: format!( - "ALTER TABLE {table} ALTER COLUMN {} SET NOT NULL;", + warnings: vec![format!( + "SQLite does not support ALTER COLUMN TYPE directly for '{}'. \ + Recreate table '{table}' with the desired column definition.", new.name + )], + }), + _ => stmts.push(MigrationStatement { + sql: format!( + "ALTER TABLE {table} ALTER COLUMN {} TYPE {};", + new.name, new.data_type ), warnings: vec![format!( - "SET NOT NULL on '{}' will scan the entire table to verify no NULLs exist. \ - This acquires AccessExclusiveLock.", - new.name + "Changing column type from '{}' to '{}' may require a table rewrite \ + and AccessExclusiveLock.", + old.data_type, new.data_type )], - }); + }), + } + } + + // Nullability change + if old.is_nullable != new.is_nullable { + match dialect { + SqlDialect::MySql => { + let warning = if new.is_nullable { + format!( + "Changing '{}' to NULL via MODIFY COLUMN may rebuild the table depending \ + on MySQL/MariaDB version and storage engine.", + new.name + ) + } else { + format!( + "Changing '{}' to NOT NULL via MODIFY COLUMN can fail if existing rows \ + contain NULL values.", + new.name + ) + }; + stmts.push(MigrationStatement { + sql: format!("ALTER TABLE {table} MODIFY COLUMN {};", new.definition()), + warnings: vec![warning], + }); + } + SqlDialect::Sqlite => { + stmts.push(MigrationStatement { + sql: format!( + "-- manual migration required for nullability change on {table}.{}", + new.name + ), + warnings: vec![format!( + "SQLite does not support ALTER COLUMN nullability directly for '{}'. \ + Recreate table '{table}' with the desired column definition.", + new.name + )], + }); + } + _ => { + if new.is_nullable { + stmts.push(MigrationStatement { + sql: format!( + "ALTER TABLE {table} ALTER COLUMN {} DROP NOT NULL;", + new.name + ), + warnings: Vec::new(), + }); + } else { + stmts.push(MigrationStatement { + sql: format!( + "ALTER TABLE {table} ALTER COLUMN {} SET NOT NULL;", + new.name + ), + warnings: vec![format!( + "SET NOT NULL on '{}' will scan the entire table to verify no NULLs exist. \ + This acquires AccessExclusiveLock.", + new.name + )], + }); + } + } } } @@ -262,7 +330,7 @@ mod tests { right.tables.insert("users".into(), t); let diff = diff_schemas(&left, &right); - let stmts = generate_migration(&diff); + let stmts = generate_migration(&diff, SqlDialect::Postgres); assert_eq!(stmts.len(), 1); assert_eq!( @@ -289,7 +357,7 @@ mod tests { right.tables.insert("users".into(), t); let diff = diff_schemas(&left, &right); - let stmts = generate_migration(&diff); + let stmts = generate_migration(&diff, SqlDialect::Postgres); assert_eq!(stmts.len(), 1); assert_eq!(stmts[0].sql, "ALTER TABLE users DROP COLUMN old_field;"); @@ -309,7 +377,7 @@ mod tests { right.tables.insert("orders".into(), t); let diff = diff_schemas(&left, &right); - let stmts = generate_migration(&diff); + let stmts = generate_migration(&diff, SqlDialect::Postgres); assert_eq!(stmts.len(), 1); assert!(stmts[0].sql.starts_with("CREATE TABLE orders")); @@ -332,7 +400,7 @@ mod tests { right.tables.insert("users".into(), t); let diff = diff_schemas(&left, &right); - let stmts = generate_migration(&diff); + let stmts = generate_migration(&diff, SqlDialect::Postgres); assert_eq!(stmts.len(), 1); assert_eq!( @@ -365,7 +433,7 @@ mod tests { right.tables.insert("orders".into(), t); let diff = diff_schemas(&left, &right); - let stmts = generate_migration(&diff); + let stmts = generate_migration(&diff, SqlDialect::Postgres); assert_eq!(stmts.len(), 1); assert_eq!(stmts[0].sql, "CREATE INDEX idx_orders_id ON orders(id);"); @@ -407,7 +475,7 @@ mod tests { right.tables.insert("orders".into(), orders); let diff = diff_schemas(&left, &right); - let stmts = generate_migration(&diff); + let stmts = generate_migration(&diff, SqlDialect::Postgres); let sqls: Vec<&str> = stmts.iter().map(|s| s.sql.as_str()).collect(); @@ -424,4 +492,102 @@ mod tests { assert!(drop_table_pos < create_table_pos); assert!(create_table_pos < add_col_pos); } + + #[test] + fn mysql_drop_index_uses_on_clause() { + let mut left = Schema::new(); + let mut t = Table::new("orders"); + t.columns + .insert("id".into(), col("id", "integer", false, None)); + t.indexes.insert( + "idx_orders_id".into(), + Index { + name: "idx_orders_id".into(), + table_name: "orders".into(), + columns: vec!["id".into()], + is_unique: false, + }, + ); + left.tables.insert("orders".into(), t); + + let mut right = Schema::new(); + let mut t = Table::new("orders"); + t.columns + .insert("id".into(), col("id", "integer", false, None)); + right.tables.insert("orders".into(), t); + + let diff = diff_schemas(&left, &right); + let stmts = generate_migration(&diff, SqlDialect::MySql); + + assert_eq!(stmts[0].sql, "DROP INDEX idx_orders_id ON orders;"); + } + + #[test] + fn sqlite_type_change_generates_manual_warning() { + let mut left = Schema::new(); + let mut t = Table::new("users"); + t.columns + .insert("email".into(), col("email", "text", false, None)); + left.tables.insert("users".into(), t); + + let mut right = Schema::new(); + let mut t = Table::new("users"); + t.columns + .insert("email".into(), col("email", "varchar(255)", false, None)); + right.tables.insert("users".into(), t); + + let diff = diff_schemas(&left, &right); + let stmts = generate_migration(&diff, SqlDialect::Sqlite); + + assert!(stmts[0].sql.starts_with("-- manual migration required")); + assert!(stmts[0].warnings[0].contains("does not support ALTER COLUMN TYPE")); + } + + #[test] + fn mysql_nullability_change_uses_modify_column() { + let mut left = Schema::new(); + let mut t = Table::new("users"); + t.columns + .insert("email".into(), col("email", "varchar(255)", true, None)); + left.tables.insert("users".into(), t); + + let mut right = Schema::new(); + let mut t = Table::new("users"); + t.columns + .insert("email".into(), col("email", "varchar(255)", false, None)); + right.tables.insert("users".into(), t); + + let diff = diff_schemas(&left, &right); + let stmts = generate_migration(&diff, SqlDialect::MySql); + + assert_eq!(stmts.len(), 1); + assert_eq!( + stmts[0].sql, + "ALTER TABLE users MODIFY COLUMN email varchar(255) NOT NULL;" + ); + } + + #[test] + fn sqlite_nullability_change_generates_manual_warning() { + let mut left = Schema::new(); + let mut t = Table::new("users"); + t.columns + .insert("email".into(), col("email", "text", true, None)); + left.tables.insert("users".into(), t); + + let mut right = Schema::new(); + let mut t = Table::new("users"); + t.columns + .insert("email".into(), col("email", "text", false, None)); + right.tables.insert("users".into(), t); + + let diff = diff_schemas(&left, &right); + let stmts = generate_migration(&diff, SqlDialect::Sqlite); + + assert_eq!(stmts.len(), 1); + assert!(stmts[0] + .sql + .starts_with("-- manual migration required for nullability change")); + assert!(stmts[0].warnings[0].contains("does not support ALTER COLUMN nullability")); + } } diff --git a/tests/config.rs b/tests/config.rs new file mode 100644 index 0000000..c667f5f --- /dev/null +++ b/tests/config.rs @@ -0,0 +1,60 @@ +use assert_cmd::Command; +use predicates::prelude::*; + +fn cmd() -> Command { + Command::cargo_bin("dbdiff").unwrap() +} + +#[test] +fn config_ignores_table() { + // The fixture dbdiff.yml ignores audit_log table. + // schema_b.sql adds audit_log, so without config it would show up in diff. + cmd() + .args([ + "tests/fixtures/schema_a.sql", + "--schema", + "tests/fixtures/schema_b.sql", + "--config", + "tests/fixtures/dbdiff.yml", + "--format", + "json", + ]) + .assert() + .success() + .stdout(predicate::str::contains("audit_log").not()); +} + +#[test] +fn config_ignores_column() { + // The fixture dbdiff.yml ignores *.created_at columns. + // Both schemas have created_at columns that should be filtered out. + cmd() + .args([ + "tests/fixtures/schema_a.sql", + "--schema", + "tests/fixtures/schema_b.sql", + "--config", + "tests/fixtures/dbdiff.yml", + "--format", + "json", + ]) + .assert() + .success() + .stdout(predicate::str::contains("created_at").not()); +} + +#[test] +fn missing_config_file_uses_defaults() { + // Non-existent config file should not cause an error — just use defaults. + cmd() + .args([ + "tests/fixtures/schema_a.sql", + "--schema", + "tests/fixtures/schema_b.sql", + "--config", + "/nonexistent/path/.dbdiff.yml", + ]) + .assert() + .success() + .stdout(predicate::str::contains("audit_log")); +} diff --git a/tests/fixtures/dbdiff.yml b/tests/fixtures/dbdiff.yml new file mode 100644 index 0000000..0541dc2 --- /dev/null +++ b/tests/fixtures/dbdiff.yml @@ -0,0 +1,8 @@ +ignore: + tables: + - audit_log + columns: + - "*.created_at" +output: + format: pretty + color: true