From ad156dc1880a33b58e04d2864246e63c6b5e283b Mon Sep 17 00:00:00 2001 From: "joel@joellee.org" Date: Sun, 10 Dec 2023 22:47:02 +0800 Subject: [PATCH 1/2] feat: bump version --- Cargo.lock | 98 +++++++++++++++++++++++------------- supabase-wrappers/Cargo.toml | 4 +- wrappers/Cargo.lock | 54 +++++++++++++++----- wrappers/Cargo.toml | 4 +- 4 files changed, 110 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c07c4a4..e3c096d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -153,9 +153,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cargo_toml" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a1f1117a8ff2f3547295da90f473c392d8d1107c90cea1ea82b1a544a97a4a" +checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3" dependencies = [ "serde", "toml", @@ -663,9 +663,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" @@ -883,9 +883,9 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde2cf81d16772f2e75c91edd2e868de1bd67a79d6c45c3d25c62b2ed3851d70" +checksum = "cb44171122605250e719ca2ae49afb357bdb2fce4b3c876fcf2225165237328a" dependencies = [ "atomic-traits", "bitflags 2.4.0", @@ -908,9 +908,9 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9c035c16a41b126f8c2b37307f2c717b5ee72ff8e7495ff502ad35471a0b38" +checksum = "a18ac8628b7de2f29a93d0abdbdcaee95a0e0ef4b59fd4de99cc117e166e843b" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", @@ -920,9 +920,9 @@ dependencies = [ [[package]] name = "pgrx-pg-config" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f9d9b6310ea9f13570d773d173bbcfe47ac844075bf6a3e207e7209786c631" +checksum = "acd45ac6eb1142c5690df63c4e0bdfb74f27c9f93a7af84f064dc2c0a2c2d6f7" dependencies = [ "cargo_toml", "dirs", @@ -938,11 +938,12 @@ dependencies = [ [[package]] name = "pgrx-pg-sys" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f821614646963302a8499b8ac8332cc0e2ae3f8715a0220986984443d8880f74" +checksum = "81c6207939582934fc26fceb651cb5338e363c06ddc6b2d50ca71867f7c70ffe" dependencies = [ "bindgen", + "clang-sys", "eyre", "libc", "memoffset 0.9.0", @@ -956,13 +957,14 @@ dependencies = [ "shlex", "sptr", "syn 1.0.109", + "walkdir", ] [[package]] name = "pgrx-sql-entity-graph" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4743b5b23fd418cded0c2dbe4b1529628f7fa59b8d68426eafdde0cb51541c96" +checksum = "a50083de83b1fac2484e8f2c2a7da5fed0193904e2578fa6c4ce02262c455c2b" dependencies = [ "convert_case", "eyre", @@ -975,9 +977,9 @@ dependencies = [ [[package]] name = "pgrx-tests" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177bb8f6811bd65180c5a24a33666baed0ed5c08cc584c4bdb78f7fe19304363" +checksum = "6ba0115cd80d9e3ca1d5d2a8ab8b7320d6ed614a53d025b86152696a8b3caa75" dependencies = [ "clap-cargo", "eyre", @@ -1078,9 +1080,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -1218,25 +1220,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -1247,9 +1249,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rustc-hash" @@ -1306,6 +1308,15 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -1391,9 +1402,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -1662,9 +1673,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.0" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -1674,18 +1685,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "serde", @@ -1800,6 +1811,16 @@ dependencies = [ "libc", ] +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -1896,6 +1917,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/supabase-wrappers/Cargo.toml b/supabase-wrappers/Cargo.toml index 067cad40..998e9534 100644 --- a/supabase-wrappers/Cargo.toml +++ b/supabase-wrappers/Cargo.toml @@ -19,14 +19,14 @@ pg16 = ["pgrx/pg16", "pgrx-tests/pg16"] pg_test = [] [dependencies] -pgrx = { version = "=0.11.0", default-features = false } +pgrx = { version = "=0.11.2", default-features = false } thiserror = "1.0.48" tokio = { version = "1.24", features = ["rt"] } uuid = { version = "1.2.2" } supabase-wrappers-macros = { version = "0.1", path = "../supabase-wrappers-macros" } [dev-dependencies] -pgrx-tests = "=0.11.0" +pgrx-tests = "=0.11.2" [package.metadata.docs.rs] features = ["pg15", "cshim"] diff --git a/wrappers/Cargo.lock b/wrappers/Cargo.lock index f38d182c..5ec7282a 100644 --- a/wrappers/Cargo.lock +++ b/wrappers/Cargo.lock @@ -2544,9 +2544,9 @@ dependencies = [ [[package]] name = "pgrx" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3c4b36fbe84329b86c83bfd33b9514a50606f00074f47085f99062a7dd8c9c" +checksum = "cb44171122605250e719ca2ae49afb357bdb2fce4b3c876fcf2225165237328a" dependencies = [ "atomic-traits", "bitflags 2.4.0", @@ -2569,9 +2569,9 @@ dependencies = [ [[package]] name = "pgrx-macros" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6a41e021321a814fac1aa27bd4266208b4507709ecbc28fc99693adfbd0c41" +checksum = "a18ac8628b7de2f29a93d0abdbdcaee95a0e0ef4b59fd4de99cc117e166e843b" dependencies = [ "pgrx-sql-entity-graph", "proc-macro2", @@ -2581,9 +2581,9 @@ dependencies = [ [[package]] name = "pgrx-pg-config" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da1e26800e747d501b8d8bb8aeee4530a07d93a39c3fb2c4229a8feff213b2" +checksum = "acd45ac6eb1142c5690df63c4e0bdfb74f27c9f93a7af84f064dc2c0a2c2d6f7" dependencies = [ "cargo_toml", "dirs", @@ -2599,11 +2599,12 @@ dependencies = [ [[package]] name = "pgrx-pg-sys" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9032b517525ec71579cc68e92905b5f5f63e892c094834202313c42f2f1a669" +checksum = "81c6207939582934fc26fceb651cb5338e363c06ddc6b2d50ca71867f7c70ffe" dependencies = [ "bindgen", + "clang-sys", "eyre", "libc", "memoffset", @@ -2617,13 +2618,14 @@ dependencies = [ "shlex", "sptr", "syn 1.0.109", + "walkdir", ] [[package]] name = "pgrx-sql-entity-graph" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4a88203974b887bca8bfdea17ab9936411fb7e84957763dc0124df78d07907" +checksum = "a50083de83b1fac2484e8f2c2a7da5fed0193904e2578fa6c4ce02262c455c2b" dependencies = [ "convert_case", "eyre", @@ -2636,9 +2638,9 @@ dependencies = [ [[package]] name = "pgrx-tests" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c80deb4310538e6ef14f4cbb30b56eb24b6d7aae66bfd4e516f153987159e65e" +checksum = "6ba0115cd80d9e3ca1d5d2a8ab8b7320d6ed614a53d025b86152696a8b3caa75" dependencies = [ "clap-cargo", "eyre", @@ -3223,6 +3225,15 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.22" @@ -4047,6 +4058,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -4197,6 +4218,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/wrappers/Cargo.toml b/wrappers/Cargo.toml index 0b0e0453..aa2e5085 100644 --- a/wrappers/Cargo.toml +++ b/wrappers/Cargo.toml @@ -104,7 +104,7 @@ all_fdws = [ ] [dependencies] -pgrx = { version = "=0.11.0" } +pgrx = { version = "=0.11.2" } #supabase-wrappers = "0.1" supabase-wrappers = { path = "../supabase-wrappers", default-features = false } @@ -156,7 +156,7 @@ arrow-array = { version = "41.0.0", optional = true } thiserror = { version = "1.0.48", optional = true } [dev-dependencies] -pgrx-tests = "=0.11.0" +pgrx-tests = "=0.11.2" [profile.dev] panic = "unwind" From 5e9e2effc8af42669fe4ddf63841604a2ecd0e57 Mon Sep 17 00:00:00 2001 From: "joel@joellee.org" Date: Sun, 10 Dec 2023 22:53:21 +0800 Subject: [PATCH 2/2] feat: bump ci too --- .github/workflows/test_supabase_wrappers.yml | 2 +- .github/workflows/test_wrappers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_supabase_wrappers.yml b/.github/workflows/test_supabase_wrappers.yml index ba50f9da..694c74fa 100644 --- a/.github/workflows/test_supabase_wrappers.yml +++ b/.github/workflows/test_supabase_wrappers.yml @@ -40,6 +40,6 @@ jobs: postgresql-server-dev-15 sudo chmod a+rwx `/usr/lib/postgresql/15/bin/pg_config --pkglibdir` `/usr/lib/postgresql/15/bin/pg_config --sharedir`/extension /var/run/postgresql/ - - run: cargo install cargo-pgrx --version 0.11.0 + - run: cargo install cargo-pgrx --version 0.11.2 - run: cargo pgrx init --pg15 /usr/lib/postgresql/15/bin/pg_config - run: cd supabase-wrappers && cargo test diff --git a/.github/workflows/test_wrappers.yml b/.github/workflows/test_wrappers.yml index 3ae63e0a..9647e20c 100644 --- a/.github/workflows/test_wrappers.yml +++ b/.github/workflows/test_wrappers.yml @@ -44,6 +44,6 @@ jobs: postgresql-server-dev-15 sudo chmod a+rwx `/usr/lib/postgresql/15/bin/pg_config --pkglibdir` `/usr/lib/postgresql/15/bin/pg_config --sharedir`/extension /var/run/postgresql/ - - run: cargo install cargo-pgrx --version 0.11.0 + - run: cargo install cargo-pgrx --version 0.11.2 - run: cargo pgrx init --pg15 /usr/lib/postgresql/15/bin/pg_config - run: cd wrappers && cargo pgrx test --features all_fdws,pg15