diff --git a/Cargo.lock b/Cargo.lock index 37af3ce..e317cb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -886,7 +886,7 @@ dependencies = [ [[package]] name = "pg_debyte_core" -version = "0.2.0" +version = "0.2.1" dependencies = [ "bincode", "hex", @@ -914,14 +914,14 @@ dependencies = [ [[package]] name = "pg_debyte_macros" -version = "0.2.0" +version = "0.2.1" dependencies = [ "pg_debyte_core", ] [[package]] name = "pg_debyte_pgrx" -version = "0.2.0" +version = "0.2.1" dependencies = [ "pg_debyte_core", "pgrx", diff --git a/README.md b/README.md index 55106a1..1bce93a 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ cd my_pg_debyte_ext [dependencies] pgrx = { version = "0.16.1", default-features = false, features = ["pg17"] } # or: features = ["pg15"] -pg_debyte_core = "0.2.0" -pg_debyte_macros = "0.2.0" -pg_debyte_pgrx = { version = "0.2.0", default-features = false } +pg_debyte_core = "0.2.1" +pg_debyte_macros = "0.2.1" +pg_debyte_pgrx = { version = "0.2.1", default-features = false } serde = { version = "1.0", features = ["derive"] } uuid = "1.8" ``` diff --git a/examples/readme_by_id/Cargo.toml b/examples/readme_by_id/Cargo.toml index 1bacc11..62c5f2c 100644 --- a/examples/readme_by_id/Cargo.toml +++ b/examples/readme_by_id/Cargo.toml @@ -14,8 +14,8 @@ pg17 = ["pgrx/pg17", "pg_debyte_pgrx/pg17"] [dependencies] pgrx = { version = "0.16.1", default-features = false } -pg_debyte_core = { version = "0.2.0", path = "../../pg_debyte_core" } -pg_debyte_macros = { version = "0.2.0", path = "../../pg_debyte_macros" } -pg_debyte_pgrx = { version = "0.2.0", path = "../../pg_debyte_pgrx", default-features = false } +pg_debyte_core = { version = "0.2.1", path = "../../pg_debyte_core" } +pg_debyte_macros = { version = "0.2.1", path = "../../pg_debyte_macros" } +pg_debyte_pgrx = { version = "0.2.1", path = "../../pg_debyte_pgrx", default-features = false } serde = { version = "1.0", features = ["derive"] } uuid = "1.8" diff --git a/examples/readme_envelope/Cargo.toml b/examples/readme_envelope/Cargo.toml index 6d6ea6e..13dc136 100644 --- a/examples/readme_envelope/Cargo.toml +++ b/examples/readme_envelope/Cargo.toml @@ -14,8 +14,8 @@ pg17 = ["pgrx/pg17", "pg_debyte_pgrx/pg17"] [dependencies] pgrx = { version = "0.16.1", default-features = false } -pg_debyte_core = { version = "0.2.0", path = "../../pg_debyte_core" } -pg_debyte_macros = { version = "0.2.0", path = "../../pg_debyte_macros" } -pg_debyte_pgrx = { version = "0.2.0", path = "../../pg_debyte_pgrx", default-features = false } +pg_debyte_core = { version = "0.2.1", path = "../../pg_debyte_core" } +pg_debyte_macros = { version = "0.2.1", path = "../../pg_debyte_macros" } +pg_debyte_pgrx = { version = "0.2.1", path = "../../pg_debyte_pgrx", default-features = false } serde = { version = "1.0", features = ["derive"] } uuid = "1.8" diff --git a/examples/readme_known_schema/Cargo.toml b/examples/readme_known_schema/Cargo.toml index 4992689..d0c510f 100644 --- a/examples/readme_known_schema/Cargo.toml +++ b/examples/readme_known_schema/Cargo.toml @@ -14,8 +14,8 @@ pg17 = ["pgrx/pg17", "pg_debyte_pgrx/pg17"] [dependencies] pgrx = { version = "0.16.1", default-features = false } -pg_debyte_core = { version = "0.2.0", path = "../../pg_debyte_core" } -pg_debyte_macros = { version = "0.2.0", path = "../../pg_debyte_macros" } -pg_debyte_pgrx = { version = "0.2.0", path = "../../pg_debyte_pgrx", default-features = false } +pg_debyte_core = { version = "0.2.1", path = "../../pg_debyte_core" } +pg_debyte_macros = { version = "0.2.1", path = "../../pg_debyte_macros" } +pg_debyte_pgrx = { version = "0.2.1", path = "../../pg_debyte_pgrx", default-features = false } serde = { version = "1.0", features = ["derive"] } uuid = "1.8" diff --git a/pg_debyte_core/Cargo.toml b/pg_debyte_core/Cargo.toml index a76e0e6..e40b473 100644 --- a/pg_debyte_core/Cargo.toml +++ b/pg_debyte_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pg_debyte_core" -version = "0.2.0" +version = "0.2.1" edition = "2021" authors = ["Dmitriy Sergeev "] description = "Core building blocks for PostgreSQL extensions that decode bytea into JSON" diff --git a/pg_debyte_ext/Cargo.toml b/pg_debyte_ext/Cargo.toml index 3574abf..4bc4911 100644 --- a/pg_debyte_ext/Cargo.toml +++ b/pg_debyte_ext/Cargo.toml @@ -23,9 +23,9 @@ pg17 = ["pgrx/pg17", "pgrx-tests/pg17", "pg_debyte_pgrx/pg17"] pg_test = [] [dependencies] -pg_debyte_core = { version = "0.2.0", path = "../pg_debyte_core" } -pg_debyte_pgrx = { version = "0.2.0", path = "../pg_debyte_pgrx", default-features = false } -pg_debyte_macros = { version = "0.2.0", path = "../pg_debyte_macros" } +pg_debyte_core = { version = "0.2.1", path = "../pg_debyte_core" } +pg_debyte_pgrx = { version = "0.2.1", path = "../pg_debyte_pgrx", default-features = false } +pg_debyte_macros = { version = "0.2.1", path = "../pg_debyte_macros" } serde = { version = "1.0", features = ["derive"] } uuid = "1.8" hex = "0.4" diff --git a/pg_debyte_macros/Cargo.toml b/pg_debyte_macros/Cargo.toml index 568f7ef..fd565b0 100644 --- a/pg_debyte_macros/Cargo.toml +++ b/pg_debyte_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pg_debyte_macros" -version = "0.2.0" +version = "0.2.1" edition = "2021" authors = ["Dmitriy Sergeev "] description = "Helper macros for registering typed decoders in pg_debyte" @@ -12,4 +12,4 @@ keywords = ["postgres", "postgresql", "bytea", "json", "pgrx"] categories = ["database", "development-tools"] [dependencies] -pg_debyte_core = { version = "0.2.0", path = "../pg_debyte_core" } +pg_debyte_core = { version = "0.2.1", path = "../pg_debyte_core" } diff --git a/pg_debyte_pgrx/Cargo.toml b/pg_debyte_pgrx/Cargo.toml index 6eb6c88..c504495 100644 --- a/pg_debyte_pgrx/Cargo.toml +++ b/pg_debyte_pgrx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pg_debyte_pgrx" -version = "0.2.0" +version = "0.2.1" edition = "2021" authors = ["Dmitriy Sergeev "] description = "pgrx glue for pg_debyte (GUCs and decode helpers)" @@ -12,7 +12,7 @@ keywords = ["postgres", "postgresql", "bytea", "json", "pgrx"] categories = ["database"] [dependencies] -pg_debyte_core = { version = "0.2.0", path = "../pg_debyte_core" } +pg_debyte_core = { version = "0.2.1", path = "../pg_debyte_core" } serde_json = "1.0" uuid = "1.8" diff --git a/pg_debyte_tools/Cargo.toml b/pg_debyte_tools/Cargo.toml index 453163d..ca5c4e8 100644 --- a/pg_debyte_tools/Cargo.toml +++ b/pg_debyte_tools/Cargo.toml @@ -31,5 +31,5 @@ path = "src/demo_second_payload.rs" serde = { version = "1.0", features = ["derive"] } bincode = "1.3" hex = "0.4" -pg_debyte_core = { version = "0.2.0", path = "../pg_debyte_core" } +pg_debyte_core = { version = "0.2.1", path = "../pg_debyte_core" } uuid = "1.8" diff --git a/scripts/dev.sh b/scripts/dev.sh index c9f9e19..d7a0980 100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -47,7 +47,11 @@ _host_examples() { _docker_run() { local cmd="$1" echo "[pg-debyte] docker: ${cmd}" - docker run --rm -i --entrypoint bash pg-debyte-ci -lc "CARGO_TERM_PROGRESS_WHEN=auto PGRX_BUILD_VERBOSE=1 ${cmd}" + if [[ -t 1 ]]; then + docker run --rm -it --entrypoint bash pg-debyte-ci -lc "TERM=xterm-256color CARGO_TERM_PROGRESS_WHEN=auto CARGO_TERM_COLOR=always PGRX_BUILD_VERBOSE=1 ${cmd}" + else + docker run --rm -i --entrypoint bash pg-debyte-ci -lc "TERM=xterm-256color CARGO_TERM_PROGRESS_WHEN=auto CARGO_TERM_COLOR=always PGRX_BUILD_VERBOSE=1 ${cmd}" + fi } _docker_tests_pg_extensions() { @@ -62,12 +66,15 @@ _docker_tests_workspace() { _docker_build_workspace() { local ver="$1" - _docker_run "cargo build --workspace --all-targets --exclude pg_debyte_ext --exclude readme_known_schema --exclude readme_by_id --exclude readme_envelope --features ${ver} && cargo build -p pg_debyte_ext --all-targets --features ${ver}" + _docker_run "cargo build --workspace --all-targets --exclude pg_debyte_ext --exclude readme_known_schema --exclude readme_by_id --exclude readme_envelope --features ${ver}" + _docker_run "cargo build -p pg_debyte_ext --all-targets --features ${ver}" } _docker_build_examples() { local ver="$1" - _docker_run "cargo build -p readme_known_schema --all-targets --features ${ver} && cargo build -p readme_by_id --all-targets --features ${ver} && cargo build -p readme_envelope --all-targets --features ${ver}" + _docker_run "cargo build -p readme_known_schema --all-targets --features ${ver}" + _docker_run "cargo build -p readme_by_id --all-targets --features ${ver}" + _docker_run "cargo build -p readme_envelope --all-targets --features ${ver}" } _host_lints() { diff --git a/scripts/package-check.sh b/scripts/package-check.sh index bacd622..5f9ad27 100755 --- a/scripts/package-check.sh +++ b/scripts/package-check.sh @@ -16,10 +16,10 @@ patch_args=( for crate in "${crates[@]}"; do if [[ "${crate}" == "pg_debyte_core" ]]; then echo "==> cargo package -p ${crate}" - cargo package -p "${crate}" + cargo package -p "${crate}" --allow-dirty else echo "==> cargo package -p ${crate} --no-verify" - cargo package -p "${crate}" --no-verify "${patch_args[@]}" + cargo package -p "${crate}" --no-verify "${patch_args[@]}" --allow-dirty fi echo done